fix: When EventStream.stop is called, the next event always is the …

…last one
schemathesis · Jun 19, 2021 · 703430c · 703430c
1 parent bbcbd92
commit 703430c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -4,6 +4,10 @@ Changelog
 `Unreleased`_ - TBD
 -------------------
 
+**Fixed**
+
+- When ``EventStream.stop`` is called, the next event always is the last one.
+
 `3.9.2`_ - 2021-06-16
 ---------------------
 

diff --git a/src/schemathesis/runner/impl/core.py b/src/schemathesis/runner/impl/core.py
@@ -74,6 +74,10 @@ def _generate_events(self, stop_event: threading.Event) -> Generator[events.Exec
         def _finish() -> events.Finished:
             return events.Finished.from_results(results=results, running_time=time.monotonic() - initialized.start_time)
 
+        if stop_event.is_set():
+            yield _finish()
+            return
+
         yield initialized
 
         if stop_event.is_set():

diff --git a/test/runner/test_runner.py b/test/runner/test_runner.py
@@ -864,6 +864,11 @@ def test_stop_event_stream(event_stream):
     assert isinstance(next(event_stream), events.Finished)
 
 
+def test_stop_event_stream_immediately(event_stream):
+    event_stream.stop()
+    assert isinstance(next(event_stream), events.Finished)
+
+
 def test_stop_event_stream_after_second_event(event_stream):
     next(event_stream)
     assert isinstance(next(event_stream), events.BeforeExecution)