Fix #126 - Simulator reset does not wait for simulation to complete (#…

…131)
intel · Jun 14, 2022 · 26cb8df · 26cb8df
1 parent ffa65c5
commit 26cb8df
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/lib/src/simulator.dart b/lib/src/simulator.dart
@@ -92,6 +92,8 @@ class Simulator {
   ///
   /// Note: values deposited on [Module]s from the previous simulation remain.
   static Future<void> reset() async {
+    if (_simulationEndRequested) await simulationEnded;
+
     _currentTimestamp = 0;
     _simulationEndRequested = false;
     _maxSimTime = -1;

diff --git a/test/simulator_test.dart b/test/simulator_test.dart
@@ -49,4 +49,11 @@ void main() {
     expect(tooFar, equals(false));
     expect(farEnough, equals(true));
   });
+
+  test('simulator reset waits for simulation to complete', () async {
+    Simulator.registerAction(100, () => Simulator.endSimulation());
+    Simulator.registerAction(100, () => Simulator.reset());
+    Simulator.registerAction(100, () => true);
+    await Simulator.run();
+  });
 }