oeqa/terminal : improve the test case
PATCH v2 1/1 oeqa/terminal : improve the test case
In reply to a message not in the archiveFrom: Teoh Jay Shen <[email protected]>
-Improve this test case to fulfill the requirements of replacing the click_terminal_icon_on_X_desktop manual test case from oeqa/manual/bsp-hw :
1) verify that the terminal window is working without problem
2) verify that there's only 1 terminal window is launched
3) reduce test case run time
--- meta/lib/oeqa/runtime/cases/terminal.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)
meta/lib/oeqa/runtime/cases/terminal.py +8 -9
@@ -2,21 +2,20 @@ from oeqa.runtime.case import OERuntimeTestCase from oeqa.core.decorator.depends import OETestDepends from oeqa.runtime.decorator.package import OEHasPackage -import re +import threading +import time class TerminalTest(OERuntimeTestCase): @OEHasPackage(['matchbox-terminal']) @OETestDepends(['ssh.SSHTest.test_ssh']) def test_terminal_running(self): - status, output = self.target.run("export DISPLAY=:0 && matchbox-terminal",) - check_terminal = re.search("Process killed - no output for 300 seconds.", output) - self.assertTrue(check_terminal, msg='Terminal window should be launched without any problem') - - status, output = self.target.run('pidof matchbox-terminal | wc -w') - output = int(output) - self.assertEqual(output, 1, 'There should be only one terminal window being launched. Terminal window launched : %s' % output) + t_thread = threading.Thread(target=self.target.run, args=("export DISPLAY=:0 && matchbox-terminal -e 'sh -c \"uname -a && exec sh\"'",)) + 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.')
Signature · 1 line
2.7.4
Quoted 38 lines · Jay Shen
From: Teoh Jay Shen <[email protected]>
-Improve this test case to fulfill the requirements of replacing the
click_terminal_icon_on_X_desktopmanual test case from oeqa/manual/bsp-hw :
1) verify that the terminal window is working without problem
2) verify that there's only 1 terminal window is launched
3) reduce test case run timeSigned-off-by Teoh Jay Shen <[email protected]>--- meta/lib/oeqa/runtime/cases/terminal.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)meta/lib/oeqa/runtime/cases/terminal.py +3
-8@@ -2,21 +2,20 @@ from oeqa.runtime.case import OERuntimeTestCase from oeqa.core.decorator.depends import OETestDepends from oeqa.runtime.decorator.package import OEHasPackage -import re +import threading +import time class TerminalTest(OERuntimeTestCase): @OEHasPackage(['matchbox-terminal']) @OETestDepends(['ssh.SSHTest.test_ssh']) def test_terminal_running(self): - status, output = self.target.run("export DISPLAY=:0 && matchbox-terminal",) - check_terminal = re.search("Process killed - no output for 300 seconds.", output) - self.assertTrue(check_terminal, msg='Terminal window should be launched without any problem') - - status, output = self.target.run('pidof matchbox-terminal | wc -w') - output = int(output) - self.assertEqual(output, 1, 'There should be only one terminal window being launched. Terminal window launched : %s' % output) + t_thread = threading.Thread(target=self.target.run, args=("export DISPLAY=:0 && matchbox-terminal -e 'sh -c \"uname -a && exec sh\"'",))
meta/lib/oeqa/runtime/cases/terminal.py from oeqa.runtime.case import OERuntimeTestCase · line 21
Quoted 10 lines
meta/lib/oeqa/runtime/cases/terminal.py +5
-1+ 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.')
This patch doesn't seem to apply against master?
Cheers,
Richard
Hi Richard,
This patch is in reply to the patch below :
Thanks,
Jay
-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: Saturday, 19 December, 2020 7:07 AM
To: Teoh, Jay Shen <[email protected]>; [email protected]
Subject: Re: [OE-core] [PATCH v2] oeqa/terminal : improve the test case
Quoted 42 lines · Jay Shen
From: Teoh Jay Shen <[email protected]>
-Improve this test case to fulfill the requirements of replacing the
click_terminal_icon_on_X_desktopmanual test case from oeqa/manual/bsp-hw :
1) verify that the terminal window is working without problem
2) verify that there's only 1 terminal window is launched
3) reduce test case run timeSigned-off-by Teoh Jay Shen <[email protected]>--- meta/lib/oeqa/runtime/cases/terminal.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-)meta/lib/oeqa/runtime/cases/terminal.py +0
-0@@ -2,21 +2,20 @@ from oeqa.runtime.case import OERuntimeTestCasefrom oeqa.core.decorator.depends import OETestDepends from oeqa.runtime.decorator.package import OEHasPackage
meta/lib/oeqa/runtime/cases/terminal.py +5
-8-import re +import threading +import time class TerminalTest(OERuntimeTestCase): @OEHasPackage(['matchbox-terminal']) @OETestDepends(['ssh.SSHTest.test_ssh']) def test_terminal_running(self): - status, output = self.target.run("export DISPLAY=:0 && matchbox-terminal",) - check_terminal = re.search("Process killed - no output for 300 seconds.", output) - self.assertTrue(check_terminal, msg='Terminal window should be launched without any problem') - - status, output = self.target.run('pidof matchbox-terminal | wc -w') - output = int(output) - self.assertEqual(output, 1, 'There should be only one terminal window being launched. Terminal window launched : %s' % output) + t_thread = threading.Thread(target=self.target.run, args=("export DISPLAY=:0 && matchbox-terminal -e 'sh -c \"uname -a && exec sh\"'",)) + t_thread.start() + time.sleep(2)
meta/lib/oeqa/runtime/cases/terminal.py from oeqa.runtime.case import OERuntimeTestCase
Quoted 10 lines
meta/lib/oeqa/runtime/cases/terminal.py +6
-1status, 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.')
This patch doesn't seem to apply against master?
Cheers,
Richard