[Qemu-devel] [PATCH] BootLinuxSshTest: Only use 'test' for unittest.TestCase method names

Philippe Mathieu-Daudé posted 1 patch 4 years, 11 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190607174953.22342-1-philmd@redhat.com
Test s390x passed
Test checkpatch passed
Test docker-clang@ubuntu passed
Test docker-mingw@fedora passed
Test FreeBSD passed
Test asan passed
Maintainers: Aleksandar Rikalo <arikalo@wavecomp.com>, Aurelien Jarno <aurelien@aurel32.net>
tests/acceptance/linux_ssh_mips_malta.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
[Qemu-devel] [PATCH] BootLinuxSshTest: Only use 'test' for unittest.TestCase method names
Posted by Philippe Mathieu-Daudé 4 years, 11 months ago
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.

Suggested-by: Cleber Rosa <crosa@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 tests/acceptance/linux_ssh_mips_malta.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/linux_ssh_mips_malta.py
index aafb0c39f6..134f10cac3 100644
--- a/tests/acceptance/linux_ssh_mips_malta.py
+++ b/tests/acceptance/linux_ssh_mips_malta.py
@@ -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.20.1


Re: [Qemu-devel] [PATCH] BootLinuxSshTest: Only use 'test' for unittest.TestCase method names
Posted by Philippe Mathieu-Daudé 4 years, 10 months ago
ping?

On 6/7/19 7:49 PM, Philippe Mathieu-Daudé wrote:
> 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.
> 
> Suggested-by: Cleber Rosa <crosa@redhat.com>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>  tests/acceptance/linux_ssh_mips_malta.py | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/tests/acceptance/linux_ssh_mips_malta.py b/tests/acceptance/linux_ssh_mips_malta.py
> index aafb0c39f6..134f10cac3 100644
> --- a/tests/acceptance/linux_ssh_mips_malta.py
> +++ b/tests/acceptance/linux_ssh_mips_malta.py
> @@ -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')
> 

Re: [Qemu-devel] [PATCH] BootLinuxSshTest: Only use 'test' for unittest.TestCase method names
Posted by Aleksandar Markovic 4 years, 10 months ago
On Jul 1, 2019 4:22 PM, "Philippe Mathieu-Daudé" <philmd@redhat.com> wrote:
>
> ping?
>
> On 6/7/19 7:49 PM, Philippe Mathieu-Daudé wrote:
> > 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.
> >
> > Suggested-by: Cleber Rosa <crosa@redhat.com>
> > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > ---

Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>

> >  tests/acceptance/linux_ssh_mips_malta.py | 10 +++++-----
> >  1 file changed, 5 insertions(+), 5 deletions(-)
> >
> > diff --git a/tests/acceptance/linux_ssh_mips_malta.py
b/tests/acceptance/linux_ssh_mips_malta.py
> > index aafb0c39f6..134f10cac3 100644
> > --- a/tests/acceptance/linux_ssh_mips_malta.py
> > +++ b/tests/acceptance/linux_ssh_mips_malta.py
> > @@ -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')
> >
>
Re: [Qemu-devel] [PATCH] BootLinuxSshTest: Only use 'test' for unittest.TestCase method names
Posted by Cleber Rosa 4 years, 10 months ago
On Mon, Jul 01, 2019 at 05:03:33PM +0200, Aleksandar Markovic wrote:
> On Jul 1, 2019 4:22 PM, "Philippe Mathieu-Daudé" <philmd@redhat.com> wrote:
> >
> > ping?
> >
> > On 6/7/19 7:49 PM, Philippe Mathieu-Daudé wrote:
> > > 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.
> > >
> > > Suggested-by: Cleber Rosa <crosa@redhat.com>
> > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > > ---
> 
> Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>

Reviewed-by: Cleber Rosa <crosa@redhat.com>

And queued on my python-next branch.

> 
> > >  tests/acceptance/linux_ssh_mips_malta.py | 10 +++++-----
> > >  1 file changed, 5 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/tests/acceptance/linux_ssh_mips_malta.py
> b/tests/acceptance/linux_ssh_mips_malta.py
> > > index aafb0c39f6..134f10cac3 100644
> > > --- a/tests/acceptance/linux_ssh_mips_malta.py
> > > +++ b/tests/acceptance/linux_ssh_mips_malta.py
> > > @@ -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')
> > >
> >

Re: [Qemu-devel] [PATCH] BootLinuxSshTest: Only use 'test' for unittest.TestCase method names
Posted by Aleksandar Markovic 4 years, 10 months ago
On Jul 1, 2019 5:23 PM, "Cleber Rosa" <crosa@redhat.com> wrote:
>
> On Mon, Jul 01, 2019 at 05:03:33PM +0200, Aleksandar Markovic wrote:
> > On Jul 1, 2019 4:22 PM, "Philippe Mathieu-Daudé" <philmd@redhat.com>
wrote:
> > >
> > > ping?
> > >
> > > On 6/7/19 7:49 PM, Philippe Mathieu-Daudé wrote:
> > > > 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.
> > > >
> > > > Suggested-by: Cleber Rosa <crosa@redhat.com>
> > > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > > > ---
> >
> > Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
>
> Reviewed-by: Cleber Rosa <crosa@redhat.com>
>
> And queued on my python-next branch.
>

Beautiful, thanks!

> >
> > > >  tests/acceptance/linux_ssh_mips_malta.py | 10 +++++-----
> > > >  1 file changed, 5 insertions(+), 5 deletions(-)
> > > >
> > > > diff --git a/tests/acceptance/linux_ssh_mips_malta.py
> > b/tests/acceptance/linux_ssh_mips_malta.py
> > > > index aafb0c39f6..134f10cac3 100644
> > > > --- a/tests/acceptance/linux_ssh_mips_malta.py
> > > > +++ b/tests/acceptance/linux_ssh_mips_malta.py
> > > > @@ -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')
> > > >
> > >