Skip to contentSkip to conversation

Acceptance test machine_m68k_nextcube.py: relax the error code pattern

PATCH In review Cleber Rosa 3 participants 4 messages Sep 19, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Acceptance test machine_m68k_nextcube.py: relax the error code pattern

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.

---
 tests/acceptance/machine_m68k_nextcube.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/acceptance/machine_m68k_nextcube.py +1 -1
index e09cab9f20..fcd2c58ee7 100644
@@ -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)
Signature · 1 line
2.21.0
Reviewed-by on v1 1/1
#1 lore raw

Cc'ing Thomas

Quoted 4 lines · Cleber Rosa

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).

Quoted 11 lines
---
 tests/acceptance/machine_m68k_nextcube.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tests/acceptance/machine_m68k_nextcube.py +0 -0
index e09cab9f20..fcd2c58ee7 100644

tests/acceptance/machine_m68k_nextcube.py class NextCubeMachine(Test): · line 121

Quoted 7 lines
tests/acceptance/machine_m68k_nextcube.py +1 -1
@@ -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
#2 lore raw

Am Thu, 19 Sep 2019 18:19:40 +0200
schrieb Philippe Mathieu-Daudé <[email protected]>:

Quoted 10 lines

Cc'ing Thomas

Quoted 4 lines · Cleber Rosa

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.

Quoted 5 lines
Quoted 5 lines
---
 tests/acceptance/machine_m68k_nextcube.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines

tests/acceptance/machine_m68k_nextcube.py class NextCubeMachine(Test): · line 121

Quoted 13 lines
(quoted diff) +0 -0

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)

tests/acceptance/machine_m68k_nextcube.py +1 -1
-        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)  
#3 lore raw
Quoted 38 lines · Thomas Huth

Am Thu, 19 Sep 2019 18:19:40 +0200
schrieb Philippe Mathieu-Daudé <[email protected]>:

Quoted 10 lines

Cc'ing Thomas

Quoted 4 lines · Cleber Rosa

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.

Quoted 5 lines
Quoted 5 lines
---
 tests/acceptance/machine_m68k_nextcube.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 15 lines

tests/acceptance/machine_m68k_nextcube.py class NextCubeMachine(Test): · line 121

Quoted 13 lines
(quoted diff) +0 -0

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)

tests/acceptance/machine_m68k_nextcube.py +1 -1
-        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)  
Quoted 1 line

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

- Cleber.