diff options
author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:55:30 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
commit | 706d5aacd7ab7b37c00df1a1b210e4ced06119e1 (patch) | |
tree | ed0bec373424d01accfb2e9c895c177a3e2d7abe /poky/meta/lib/oeqa/runtime | |
parent | ac970dd705934286df062e0f1501f776dc2ef01d (diff) | |
download | openbmc-706d5aacd7ab7b37c00df1a1b210e4ced06119e1.tar.xz |
Reset poky to before our libpam hacks
Things got a bit out of synch with openbmc-config due to the libpam
issues and the migration from the meta-* layers.
Revert the two previous commits and then put the latest poky in with the
libpam revert and get openbmc-config right again.
Revert "Revert "libpam: update 1.3.1 -> 1.5.1""
This reverts commit 87ddd3eab4df68e624b5350ccaab28b3b97547c0.
Revert "poky: subtree update:796be0593a..10c69538c0"
This reverts commit c723b72979bfac6362509cf1fe086900f6641f28.
Change-Id: I3a1f405193aee6a21fe0cd24be9927c143a23d9a
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Diffstat (limited to 'poky/meta/lib/oeqa/runtime')
-rw-r--r-- | poky/meta/lib/oeqa/runtime/cases/suspend.py | 33 | ||||
-rw-r--r-- | poky/meta/lib/oeqa/runtime/cases/terminal.py | 7 |
2 files changed, 2 insertions, 38 deletions
diff --git a/poky/meta/lib/oeqa/runtime/cases/suspend.py b/poky/meta/lib/oeqa/runtime/cases/suspend.py deleted file mode 100644 index 67b6f7e56..000000000 --- a/poky/meta/lib/oeqa/runtime/cases/suspend.py +++ /dev/null @@ -1,33 +0,0 @@ -from oeqa.runtime.case import OERuntimeTestCase -from oeqa.core.decorator.depends import OETestDepends -from oeqa.core.decorator.data import skipIfQemu -import threading -import time - -class Suspend_Test(OERuntimeTestCase): - - def test_date(self): - (status, output) = self.target.run('date') - self.assertEqual(status, 0, msg = 'Failed to run date command, output : %s' % output) - - def test_ping(self): - t_thread = threading.Thread(target=self.target.run, args=("ping 8.8.8.8",)) - t_thread.start() - time.sleep(2) - - status, output = self.target.run('pidof ping') - self.target.run('kill -9 %s' % output) - self.assertEqual(status, 0, msg = 'Not able to find process that runs ping, output : %s' % output) - - def set_suspend(self): - (status, output) = self.target.run('sudo rtcwake -m mem -s 10') - self.assertEqual(status, 0, msg = 'Failed to suspends your system to RAM, output : %s' % output) - - @skipIfQemu('qemuall', 'Test only runs on real hardware') - @OETestDepends(['ssh.SSHTest.test_ssh']) - def test_suspend(self): - self.test_date() - self.test_ping() - self.set_suspend() - self.test_date() - self.test_ping() diff --git a/poky/meta/lib/oeqa/runtime/cases/terminal.py b/poky/meta/lib/oeqa/runtime/cases/terminal.py index 8fcca99f4..a268f2688 100644 --- a/poky/meta/lib/oeqa/runtime/cases/terminal.py +++ b/poky/meta/lib/oeqa/runtime/cases/terminal.py @@ -10,12 +10,9 @@ class TerminalTest(OERuntimeTestCase): @OEHasPackage(['matchbox-terminal']) @OETestDepends(['ssh.SSHTest.test_ssh']) def test_terminal_running(self): - t_thread = threading.Thread(target=self.target.run, args=("export DISPLAY=:0 && matchbox-terminal -e 'sh -c \"uname -a && exec sh\"'",)) + t_thread = threading.Thread(target=self.target.run, args=('export DISPLAY=:0 && matchbox-terminal',)) t_thread.start() time.sleep(2) - status, output = self.target.run('pidof matchbox-terminal') - number_of_terminal = len(output.split()) - self.assertEqual(number_of_terminal, 1, msg='There should be only one terminal being launched. Number of terminal launched : %s' % number_of_terminal) self.target.run('kill -9 %s' % output) - self.assertEqual(status, 0, msg='Not able to find process that runs terminal.') + self.assertEqual(status, 0, msg='Not able to find process that runs terminal.') |