Merge pull request #323 from kosarev/use_exceptions_to_stop_emulation

[Tests] Use exceptions for quitting from the emulation loop.

Author: boriel

tests/runtime/check_test.py

@@ -5,6 +5,10 @@
 import zx
 
 
+class Stop(Exception):
+    pass
+
+
 class Tester(zx.Emulator):
     def __init__(self):
         # speed_factor=None results in maximum speed and
@@ -13,7 +17,7 @@ def __init__(self):
         super().__init__(speed_factor=None)
 
     def on_breakpoint(self):
-        self.stop()
+        raise Stop
 
     def run_test(self, tape_filename, ram_filename):
         # Auto-load the tape.
@@ -22,8 +26,11 @@ def run_test(self, tape_filename, ram_filename):
         # Catch the end of test.
         self.set_breakpoint(8)
 
-        # Run the main loop until self.done is raised.
-        self.run()
+        # Run the main loop.
+        try:
+            self.run()
+        except Stop:
+            pass
 
         # Get view to the video memory.
         screen = self.get_memory_view(0x4000, 6 * 1024 + 768)

tests/runtime/update_test.py

@@ -8,6 +8,10 @@
 import zx
 
 
+class Stop(Exception):
+    pass
+
+
 class TakeSnapshot(zx.Emulator):
     def __init__(self):
         # speed_factor=None results in maximum speed and
@@ -25,13 +29,16 @@ def run_test(self, filename):
         # Catch the end of test.
         self.set_breakpoint(8)
 
-        # Run the main loop until self.done is raised.
-        self.run()
+        # Run the main loop.
+        try:
+            self.run()
+        except Stop:
+            pass
 
         # Get view to the video memory.
         screen = self.get_memory_view(0x4000, 6 * 1024 + 768)
 
-        # Compare it with the etalon screenshot.
+        # Take screenshot.
         with open(filename + '.scr', 'wb') as f:
             f.write(screen)