Acceptance test machine_m68k_nextcube.py: relax the error code pattern
diff mbox series

Message ID 20190919161400.26399-1-crosa@redhat.com
State New
Headers show
Series
  • Acceptance test machine_m68k_nextcube.py: relax the error code pattern
Related show

Commit Message

Cleber Rosa Sept. 19, 2019, 4:14 p.m. UTC
Instead of looking for a specific error, let's relax the pattern
because different errors have been seen (I'm consistenly getting 52)
and the real goal of this test is to validate the framebuffer
operation, and not to reproduce one specific error.

Signed-off-by: Cleber Rosa <crosa@redhat.com>
---
 tests/acceptance/machine_m68k_nextcube.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Philippe Mathieu-Daudé Sept. 19, 2019, 4:19 p.m. UTC | #1
Cc'ing Thomas

On 9/19/19 6:14 PM, Cleber Rosa wrote:
> Instead of looking for a specific error, let's relax the pattern
> because different errors have been seen (I'm consistenly getting 52)
> and the real goal of this test is to validate the framebuffer
> operation, and not to reproduce one specific error.

This might be because I wrote this test before Thomas added the serial
controller (commit b17bed5b1727e3aa9e37fc8e8c3222130ceab22f).

> Signed-off-by: Cleber Rosa <crosa@redhat.com>
> ---
>  tests/acceptance/machine_m68k_nextcube.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/acceptance/machine_m68k_nextcube.py b/tests/acceptance/machine_m68k_nextcube.py
> index e09cab9f20..fcd2c58ee7 100644
> --- a/tests/acceptance/machine_m68k_nextcube.py
> +++ b/tests/acceptance/machine_m68k_nextcube.py
> @@ -116,6 +116,6 @@ class NextCubeMachine(Test):
>              if len(line):
>                  console_logger.debug(line)
>          self.assertIn('Testing the FPU, SCC', text)
> -        self.assertIn('System test failed. Error code 51', text)
> +        self.assertIn('System test failed. Error code', text)
>          self.assertIn('Boot command', text)
>          self.assertIn('Next>', text)
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Thomas Huth Sept. 19, 2019, 7:26 p.m. UTC | #2
Am Thu, 19 Sep 2019 18:19:40 +0200
schrieb Philippe Mathieu-Daudé <philmd@redhat.com>:

> Cc'ing Thomas
> 
> On 9/19/19 6:14 PM, Cleber Rosa wrote:
> > Instead of looking for a specific error, let's relax the pattern
> > because different errors have been seen (I'm consistenly getting 52)
> > and the real goal of this test is to validate the framebuffer
> > operation, and not to reproduce one specific error.  
> 
> This might be because I wrote this test before Thomas added the serial
> controller (commit b17bed5b1727e3aa9e37fc8e8c3222130ceab22f).

That's strange, the travis job worked fine for me ... but sure, let's
drop the error number, we don't need it here. 

> > Signed-off-by: Cleber Rosa <crosa@redhat.com>
> > ---
> >  tests/acceptance/machine_m68k_nextcube.py | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/tests/acceptance/machine_m68k_nextcube.py
> > b/tests/acceptance/machine_m68k_nextcube.py index
> > e09cab9f20..fcd2c58ee7 100644 ---
> > a/tests/acceptance/machine_m68k_nextcube.py +++
> > b/tests/acceptance/machine_m68k_nextcube.py @@ -116,6 +116,6 @@
> > class NextCubeMachine(Test): if len(line):
> >                  console_logger.debug(line)
> >          self.assertIn('Testing the FPU, SCC', text)
> > -        self.assertIn('System test failed. Error code 51', text)
> > +        self.assertIn('System test failed. Error code', text)
> >          self.assertIn('Boot command', text)  
> >          self.assertIn('Next>', text)  
> >   
> 
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Reviewed-by: Thomas Huth <huth@tuxfamily.org>
Cleber Rosa Sept. 19, 2019, 10:20 p.m. UTC | #3
On Thu, Sep 19, 2019 at 09:26:35PM +0200, Thomas Huth wrote:
> Am Thu, 19 Sep 2019 18:19:40 +0200
> schrieb Philippe Mathieu-Daudé <philmd@redhat.com>:
> 
> > Cc'ing Thomas
> > 
> > On 9/19/19 6:14 PM, Cleber Rosa wrote:
> > > Instead of looking for a specific error, let's relax the pattern
> > > because different errors have been seen (I'm consistenly getting 52)
> > > and the real goal of this test is to validate the framebuffer
> > > operation, and not to reproduce one specific error.  
> > 
> > This might be because I wrote this test before Thomas added the serial
> > controller (commit b17bed5b1727e3aa9e37fc8e8c3222130ceab22f).
> 
> That's strange, the travis job worked fine for me ... but sure, let's
> drop the error number, we don't need it here. 
> 
> > > Signed-off-by: Cleber Rosa <crosa@redhat.com>
> > > ---
> > >  tests/acceptance/machine_m68k_nextcube.py | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/tests/acceptance/machine_m68k_nextcube.py
> > > b/tests/acceptance/machine_m68k_nextcube.py index
> > > e09cab9f20..fcd2c58ee7 100644 ---
> > > a/tests/acceptance/machine_m68k_nextcube.py +++
> > > b/tests/acceptance/machine_m68k_nextcube.py @@ -116,6 +116,6 @@
> > > class NextCubeMachine(Test): if len(line):
> > >                  console_logger.debug(line)
> > >          self.assertIn('Testing the FPU, SCC', text)
> > > -        self.assertIn('System test failed. Error code 51', text)
> > > +        self.assertIn('System test failed. Error code', text)
> > >          self.assertIn('Boot command', text)  
> > >          self.assertIn('Next>', text)  
> > >   
> > 
> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> 
> Reviewed-by: Thomas Huth <huth@tuxfamily.org>

Thanks for the prompt review, queueing on my python-next branch.

- Cleber.

Patch
diff mbox series

diff --git a/tests/acceptance/machine_m68k_nextcube.py b/tests/acceptance/machine_m68k_nextcube.py
index e09cab9f20..fcd2c58ee7 100644
--- a/tests/acceptance/machine_m68k_nextcube.py
+++ b/tests/acceptance/machine_m68k_nextcube.py
@@ -116,6 +116,6 @@  class NextCubeMachine(Test):
             if len(line):
                 console_logger.debug(line)
         self.assertIn('Testing the FPU, SCC', text)
-        self.assertIn('System test failed. Error code 51', text)
+        self.assertIn('System test failed. Error code', text)
         self.assertIn('Boot command', text)
         self.assertIn('Next>', text)