Skip to contentSkip to conversation

BootLinuxSshTest: Only use 'test' for unittest.TestCase method names

PATCH In review Philippe Mathieu-Daudé 3 participants 5 messages Jun 7, 2019 – Jul 1, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 BootLinuxSshTest: Only use 'test' for unittest.TestCase method names

In commit f6e501a28ef9, Eduardo started to use "check_" as a prefix for methods of similar purpose. Follow this prior art, since it might become the conventions when writting Avocado tests.

---
 tests/acceptance/linux_ssh_mips_malta.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
tests/acceptance/linux_ssh_mips_malta.py +5 -5
index aafb0c39f6..134f10cac3 100644
@@ -162,7 +162,7 @@ class LinuxSSH(Test):
         self.assertIn(True, ["0dfbe8aa4c20b52e1b8bf3cb6cbdf193" in line
                              for line in stdout])
 
-    def do_test_mips_malta(self, endianess, kernel_path, uname_m):
+    def check_mips_malta(self, endianess, kernel_path, uname_m):
         self.boot_debian_wheezy_image_and_ssh_login(endianess, kernel_path)
 
         stdout, stderr = self.ssh_command('uname -a')
@@ -184,7 +184,7 @@ class LinuxSSH(Test):
         kernel_hash = '592e384a4edc16dade52a6cd5c785c637bcbc9ad'
         kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
 
-        self.do_test_mips_malta('be', kernel_path, 'mips')
+        self.check_mips_malta('be', kernel_path, 'mips')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI')
     def test_mips_malta32el_kernel3_2_0(self):
@@ -199,7 +199,7 @@ class LinuxSSH(Test):
         kernel_hash = 'a66bea5a8adaa2cb3d36a1d4e0ccdb01be8f6c2a'
         kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
 
-        self.do_test_mips_malta('le', kernel_path, 'mips')
+        self.check_mips_malta('le', kernel_path, 'mips')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI')
     def test_mips_malta64eb_kernel3_2_0(self):
@@ -213,7 +213,7 @@ class LinuxSSH(Test):
                       'vmlinux-3.2.0-4-5kc-malta')
         kernel_hash = 'db6eea7de35d36c77d8c165b6bcb222e16eb91db'
         kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
-        self.do_test_mips_malta('be', kernel_path, 'mips64')
+        self.check_mips_malta('be', kernel_path, 'mips64')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI')
     def test_mips_malta64el_kernel3_2_0(self):
@@ -227,4 +227,4 @@ class LinuxSSH(Test):
                       'vmlinux-3.2.0-4-5kc-malta')
         kernel_hash = '6a7f77245acf231415a0e8b725d91ed2f3487794'
         kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
-        self.do_test_mips_malta('le', kernel_path, 'mips64')
+        self.check_mips_malta('le', kernel_path, 'mips64')
Signature · 1 line
2.20.1
#1 lore raw

ping?

Quoted 58 lines · Philippe Mathieu-Daudé

In commit f6e501a28ef9, Eduardo started to use "check_" as a prefix for methods of similar purpose. Follow this prior art, since it might become the conventions when writting Avocado tests.

---
 tests/acceptance/linux_ssh_mips_malta.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
tests/acceptance/linux_ssh_mips_malta.py +5 -5
index aafb0c39f6..134f10cac3 100644
@@ -162,7 +162,7 @@ class LinuxSSH(Test):
         self.assertIn(True, ["0dfbe8aa4c20b52e1b8bf3cb6cbdf193" in line
                              for line in stdout])
 
-    def do_test_mips_malta(self, endianess, kernel_path, uname_m):
+    def check_mips_malta(self, endianess, kernel_path, uname_m):
         self.boot_debian_wheezy_image_and_ssh_login(endianess, kernel_path)
 
         stdout, stderr = self.ssh_command('uname -a')
@@ -184,7 +184,7 @@ class LinuxSSH(Test):
         kernel_hash = '592e384a4edc16dade52a6cd5c785c637bcbc9ad'
         kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
 
-        self.do_test_mips_malta('be', kernel_path, 'mips')
+        self.check_mips_malta('be', kernel_path, 'mips')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI')
     def test_mips_malta32el_kernel3_2_0(self):
@@ -199,7 +199,7 @@ class LinuxSSH(Test):
         kernel_hash = 'a66bea5a8adaa2cb3d36a1d4e0ccdb01be8f6c2a'
         kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
 
-        self.do_test_mips_malta('le', kernel_path, 'mips')
+        self.check_mips_malta('le', kernel_path, 'mips')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI')
     def test_mips_malta64eb_kernel3_2_0(self):
@@ -213,7 +213,7 @@ class LinuxSSH(Test):
                       'vmlinux-3.2.0-4-5kc-malta')
         kernel_hash = 'db6eea7de35d36c77d8c165b6bcb222e16eb91db'
         kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
-        self.do_test_mips_malta('be', kernel_path, 'mips64')
+        self.check_mips_malta('be', kernel_path, 'mips64')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on Travis-CI')
     def test_mips_malta64el_kernel3_2_0(self):
@@ -227,4 +227,4 @@ class LinuxSSH(Test):
                       'vmlinux-3.2.0-4-5kc-malta')
         kernel_hash = '6a7f77245acf231415a0e8b725d91ed2f3487794'
         kernel_path = self.fetch_asset(kernel_url, asset_hash=kernel_hash)
-        self.do_test_mips_malta('le', kernel_path, 'mips64')
+        self.check_mips_malta('le', kernel_path, 'mips64')
#2 lore raw
Quoted 12 lines · Philippe Mathieu-Daudé

ping?

Quoted 8 lines · Philippe Mathieu-Daudé

In commit f6e501a28ef9, Eduardo started to use "check_" as a prefix for methods of similar purpose. Follow this prior art, since it might become the conventions when writting Avocado tests.

---

Quoted 4 lines

Review

Quoted 4 lines
 tests/acceptance/linux_ssh_mips_malta.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
(quoted diff) +0 -0

b/tests/acceptance/linux_ssh_mips_malta.py

Quoted 10 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 166

Quoted 10 lines

index aafb0c39f6..134f10cac3 100644

tests/acceptance/linux_ssh_mips_malta.py +1 -1
@@ -162,7 +162,7 @@ class LinuxSSH(Test):
         self.assertIn(True, ["0dfbe8aa4c20b52e1b8bf3cb6cbdf193" in line
                              for line in stdout])
 
-    def do_test_mips_malta(self, endianess, kernel_path, uname_m):
+    def check_mips_malta(self, endianess, kernel_path, uname_m):
         self.boot_debian_wheezy_image_and_ssh_login(endianess,

kernel_path)

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 185

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +0 -0
         stdout, stderr = self.ssh_command('uname -a')
@@ -184,7 +184,7 @@ class LinuxSSH(Test):
         kernel_hash = '592e384a4edc16dade52a6cd5c785c637bcbc9ad'
         kernel_path = self.fetch_asset(kernel_url,

asset_hash=kernel_hash)

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test):

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +1 -1
-        self.do_test_mips_malta('be', kernel_path, 'mips')
+        self.check_mips_malta('be', kernel_path, 'mips')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on

Travis-CI')

Quoted 4 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 200

Quoted 4 lines
tests/acceptance/linux_ssh_mips_malta.py +0 -0
     def test_mips_malta32el_kernel3_2_0(self):
@@ -199,7 +199,7 @@ class LinuxSSH(Test):
         kernel_hash = 'a66bea5a8adaa2cb3d36a1d4e0ccdb01be8f6c2a'
         kernel_path = self.fetch_asset(kernel_url,

asset_hash=kernel_hash)

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test):

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +1 -1
-        self.do_test_mips_malta('le', kernel_path, 'mips')
+        self.check_mips_malta('le', kernel_path, 'mips')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on

Travis-CI')

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 215

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +0 -0
     def test_mips_malta64eb_kernel3_2_0(self):
@@ -213,7 +213,7 @@ class LinuxSSH(Test):
                       'vmlinux-3.2.0-4-5kc-malta')
         kernel_hash = 'db6eea7de35d36c77d8c165b6bcb222e16eb91db'
         kernel_path = self.fetch_asset(kernel_url,

asset_hash=kernel_hash)

Quoted 4 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test):

Quoted 4 lines
tests/acceptance/linux_ssh_mips_malta.py +1 -1
-        self.do_test_mips_malta('be', kernel_path, 'mips64')
+        self.check_mips_malta('be', kernel_path, 'mips64')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on

Travis-CI')

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 229

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +0 -0
     def test_mips_malta64el_kernel3_2_0(self):
@@ -227,4 +227,4 @@ class LinuxSSH(Test):
                       'vmlinux-3.2.0-4-5kc-malta')
         kernel_hash = '6a7f77245acf231415a0e8b725d91ed2f3487794'
         kernel_path = self.fetch_asset(kernel_url,

asset_hash=kernel_hash)

Quoted 4 lines
Quoted 3 lines
tests/acceptance/linux_ssh_mips_malta.py +1 -1
-        self.do_test_mips_malta('le', kernel_path, 'mips64')
+        self.check_mips_malta('le', kernel_path, 'mips64')
Reviewed-by
#3 lore raw
Quoted 10 lines · Aleksandar Markovic
Quoted 9 lines · Philippe Mathieu-Daudé

ping?

Quoted 5 lines · Philippe Mathieu-Daudé

In commit f6e501a28ef9, Eduardo started to use "check_" as a prefix for methods of similar purpose. Follow this prior art, since it might become the conventions when writting Avocado tests.

Quoted 5 lines
Quoted 3 lines
Quoted 3 lines

---

And queued on my python-next branch.

Quoted 61 lines
Quoted 5 lines

Review

Quoted 5 lines
 tests/acceptance/linux_ssh_mips_malta.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
(quoted diff) +0 -0

b/tests/acceptance/linux_ssh_mips_malta.py

Quoted 10 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 166

Quoted 10 lines

index aafb0c39f6..134f10cac3 100644

tests/acceptance/linux_ssh_mips_malta.py +1 -1
@@ -162,7 +162,7 @@ class LinuxSSH(Test):
         self.assertIn(True, ["0dfbe8aa4c20b52e1b8bf3cb6cbdf193" in line
                              for line in stdout])
 
-    def do_test_mips_malta(self, endianess, kernel_path, uname_m):
+    def check_mips_malta(self, endianess, kernel_path, uname_m):
         self.boot_debian_wheezy_image_and_ssh_login(endianess,

kernel_path)

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 185

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +0 -0
         stdout, stderr = self.ssh_command('uname -a')
@@ -184,7 +184,7 @@ class LinuxSSH(Test):
         kernel_hash = '592e384a4edc16dade52a6cd5c785c637bcbc9ad'
         kernel_path = self.fetch_asset(kernel_url,

asset_hash=kernel_hash)

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test):

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +1 -1
-        self.do_test_mips_malta('be', kernel_path, 'mips')
+        self.check_mips_malta('be', kernel_path, 'mips')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on

Travis-CI')

Quoted 4 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 200

Quoted 4 lines
tests/acceptance/linux_ssh_mips_malta.py +0 -0
     def test_mips_malta32el_kernel3_2_0(self):
@@ -199,7 +199,7 @@ class LinuxSSH(Test):
         kernel_hash = 'a66bea5a8adaa2cb3d36a1d4e0ccdb01be8f6c2a'
         kernel_path = self.fetch_asset(kernel_url,

asset_hash=kernel_hash)

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test):

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +1 -1
-        self.do_test_mips_malta('le', kernel_path, 'mips')
+        self.check_mips_malta('le', kernel_path, 'mips')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on

Travis-CI')

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 215

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +0 -0
     def test_mips_malta64eb_kernel3_2_0(self):
@@ -213,7 +213,7 @@ class LinuxSSH(Test):
                       'vmlinux-3.2.0-4-5kc-malta')
         kernel_hash = 'db6eea7de35d36c77d8c165b6bcb222e16eb91db'
         kernel_path = self.fetch_asset(kernel_url,

asset_hash=kernel_hash)

Quoted 4 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test):

Quoted 4 lines
tests/acceptance/linux_ssh_mips_malta.py +1 -1
-        self.do_test_mips_malta('be', kernel_path, 'mips64')
+        self.check_mips_malta('be', kernel_path, 'mips64')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on

Travis-CI')

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 229

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +0 -0
     def test_mips_malta64el_kernel3_2_0(self):
@@ -227,4 +227,4 @@ class LinuxSSH(Test):
                       'vmlinux-3.2.0-4-5kc-malta')
         kernel_hash = '6a7f77245acf231415a0e8b725d91ed2f3487794'
         kernel_path = self.fetch_asset(kernel_url,

asset_hash=kernel_hash)

Quoted 4 lines
Quoted 3 lines
tests/acceptance/linux_ssh_mips_malta.py +1 -1
-        self.do_test_mips_malta('le', kernel_path, 'mips64')
+        self.check_mips_malta('le', kernel_path, 'mips64')
#4 lore raw
Quoted 3 lines · Cleber Rosa
Quoted 1 line · Aleksandar Markovic

On Jul 1, 2019 4:22 PM, "Philippe Mathieu-Daudé" <[email protected]>

Quoted 13 lines · wrote:
Quoted 13 lines
Quoted 12 lines

ping?

Quoted 8 lines · Philippe Mathieu-Daudé

In commit f6e501a28ef9, Eduardo started to use "check_" as a prefix for methods of similar purpose. Follow this prior art, since it might become the conventions when writting Avocado tests.

---

Quoted 6 lines
Quoted 1 line

And queued on my python-next branch.

Beautiful, thanks!

Quoted 11 lines
Quoted 11 lines
Quoted 5 lines

Review

Quoted 5 lines
 tests/acceptance/linux_ssh_mips_malta.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
(quoted diff) +0 -0

b/tests/acceptance/linux_ssh_mips_malta.py

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 162

Quoted 5 lines

index aafb0c39f6..134f10cac3 100644

tests/acceptance/linux_ssh_mips_malta.py +0 -0
@@ -162,7 +162,7 @@ class LinuxSSH(Test):
         self.assertIn(True, ["0dfbe8aa4c20b52e1b8bf3cb6cbdf193" in

line

Quoted 50 lines
Quoted 50 lines
Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test):

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +1 -1
                              for line in stdout])
 
-    def do_test_mips_malta(self, endianess, kernel_path, uname_m):
+    def check_mips_malta(self, endianess, kernel_path, uname_m):
         self.boot_debian_wheezy_image_and_ssh_login(endianess,

kernel_path)

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 185

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +0 -0
         stdout, stderr = self.ssh_command('uname -a')
@@ -184,7 +184,7 @@ class LinuxSSH(Test):
         kernel_hash = '592e384a4edc16dade52a6cd5c785c637bcbc9ad'
         kernel_path = self.fetch_asset(kernel_url,

asset_hash=kernel_hash)

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test):

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +1 -1
-        self.do_test_mips_malta('be', kernel_path, 'mips')
+        self.check_mips_malta('be', kernel_path, 'mips')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on

Travis-CI')

Quoted 4 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 200

Quoted 4 lines
tests/acceptance/linux_ssh_mips_malta.py +0 -0
     def test_mips_malta32el_kernel3_2_0(self):
@@ -199,7 +199,7 @@ class LinuxSSH(Test):
         kernel_hash = 'a66bea5a8adaa2cb3d36a1d4e0ccdb01be8f6c2a'
         kernel_path = self.fetch_asset(kernel_url,

asset_hash=kernel_hash)

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test):

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +1 -1
-        self.do_test_mips_malta('le', kernel_path, 'mips')
+        self.check_mips_malta('le', kernel_path, 'mips')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on

Travis-CI')

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 215

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +0 -0
     def test_mips_malta64eb_kernel3_2_0(self):
@@ -213,7 +213,7 @@ class LinuxSSH(Test):
                       'vmlinux-3.2.0-4-5kc-malta')
         kernel_hash = 'db6eea7de35d36c77d8c165b6bcb222e16eb91db'
         kernel_path = self.fetch_asset(kernel_url,

asset_hash=kernel_hash)

Quoted 4 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test):

Quoted 4 lines
tests/acceptance/linux_ssh_mips_malta.py +1 -1
-        self.do_test_mips_malta('be', kernel_path, 'mips64')
+        self.check_mips_malta('be', kernel_path, 'mips64')
 
     @skipIf(os.getenv('CONTINUOUS_INTEGRATION'), 'Running on

Travis-CI')

Quoted 5 lines

tests/acceptance/linux_ssh_mips_malta.py class LinuxSSH(Test): · line 229

Quoted 5 lines
tests/acceptance/linux_ssh_mips_malta.py +0 -0
     def test_mips_malta64el_kernel3_2_0(self):
@@ -227,4 +227,4 @@ class LinuxSSH(Test):
                       'vmlinux-3.2.0-4-5kc-malta')
         kernel_hash = '6a7f77245acf231415a0e8b725d91ed2f3487794'
         kernel_path = self.fetch_asset(kernel_url,

asset_hash=kernel_hash)

Quoted 4 lines
Quoted 3 lines
tests/acceptance/linux_ssh_mips_malta.py +1 -1
-        self.do_test_mips_malta('le', kernel_path, 'mips64')
+        self.check_mips_malta('le', kernel_path, 'mips64')