Skip to contentSkip to conversation

oeqa/terminal : rework the logic

PATCH In review Teoh, Jay Shen 2 participants 4 messages Nov 9, 2020 – Dec 21, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 oeqa/terminal : rework the logic

From: Teoh Jay Shen <[email protected]>

Rework 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) code added to verify that the terminal window is working without problem
2) code added to verify that there's only 1 terminal window is launched

---
 meta/lib/oeqa/runtime/cases/terminal.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
meta/lib/oeqa/runtime/cases/terminal.py +10 -5
index a268f26..8a079a5 100644
@@ -2,17 +2,22 @@ from oeqa.runtime.case import OERuntimeTestCase
 from oeqa.core.decorator.depends import OETestDepends
 from oeqa.runtime.decorator.package import OEHasPackage
 
-import threading
-import time
+import re
 
 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',))
-        t_thread.start()
-        time.sleep(2)
+        
+        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)
+      
         status, output = self.target.run('pidof matchbox-terminal')
         self.target.run('kill -9 %s' % output)
         self.assertEqual(status, 0, msg='Not able to find process that runs terminal.')   
Signature · 1 line
2.7.4
#1 lore raw

Does this test take 5 minutes to complete? This is too much, it should only be a few seconds.

Alex

Quoted 59 lines · Jay Shen

From: Teoh Jay Shen <[email protected]>

Rework 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) code added to verify that the terminal window is working without problem
2) code added to verify that there's only 1 terminal window is launched

---
 meta/lib/oeqa/runtime/cases/terminal.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
meta/lib/oeqa/runtime/cases/terminal.py +5 -5
index a268f26..8a079a5 100644
@@ -2,17 +2,22 @@ from oeqa.runtime.case import OERuntimeTestCase
 from oeqa.core.decorator.depends import OETestDepends
 from oeqa.runtime.decorator.package import OEHasPackage
 
-import threading
-import time
+import re
 
 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',))
-        t_thread.start()
-        time.sleep(2)
+
+        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')

meta/lib/oeqa/runtime/cases/terminal.py +4 -1
+
+        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) +
status, output = self.target.run('pidof matchbox-terminal') self.target.run('kill -9 %s' % output) self.assertEqual(status, 0, msg='Not able to find process that
runs terminal.')
--
2.7.4

#2 lore raw

Hi Alex,

Yes this test took around 5 minutes to be completed. But since it is not acceptable and not reasonable for a test case to take up so much time. I will rework on it.

Thanks for the feedback.

Best Regards,
Jay

From: Alexander Kanavin <[email protected]>
Sent: Monday, 9 November, 2020 4:34 PM
To: Teoh, Jay Shen <[email protected]>
Cc: OE-core <[email protected]>
Subject: Re: [OE-core] [PATCH] oeqa/terminal : rework the logic

Does this test take 5 minutes to complete? This is too much, it should only be a few seconds.

Alex

On Mon, 9 Nov 2020 at 09:30, Teoh, Jay Shen <[email protected]<mailto:[email protected]>> wrote:
From: Teoh Jay Shen <[email protected]<mailto:[email protected]>>

Rework 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) code added to verify that the terminal window is working without problem
2) code added to verify that there's only 1 terminal window is launched

---
 meta/lib/oeqa/runtime/cases/terminal.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
meta/lib/oeqa/runtime/cases/terminal.py +10 -5
index a268f26..8a079a5 100644
@@ -2,17 +2,22 @@ from oeqa.runtime.case import OERuntimeTestCase
 from oeqa.core.decorator.depends import OETestDepends
 from oeqa.runtime.decorator.package import OEHasPackage
 
-import threading
-import time
+import re
 
 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',))
-        t_thread.start()
-        time.sleep(2)
+
+        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)
+
         status, output = self.target.run('pidof matchbox-terminal')
         self.target.run('kill -9 %s' % output)
         self.assertEqual(status, 0, msg='Not able to find process that runs terminal.')

--
2.7.4

#3 lore raw

PATCH v2 1/1 oeqa/terminal : improve the test case

From: 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

---
 meta/lib/oeqa/runtime/cases/terminal.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
meta/lib/oeqa/runtime/cases/terminal.py +5 -2
index a268f26..8fcca99 100644
@@ -10,9 +10,12 @@ 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',))
+        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