mas15
diff --git a/‎pytest_httpserver/httpserver.py‎
Lines changed: 11 additions & 2 deletions b/‎pytest_httpserver/httpserver.py‎
Lines changed: 11 additions & 2 deletions
diff --git a/‎setup.py‎
Lines changed: 1 addition & 1 deletion b/‎setup.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tests/test_oneshot.py‎
Lines changed: 3 additions & 1 deletion b/‎tests/test_oneshot.py‎
Lines changed: 3 additions & 1 deletion
@@ -126,11 +126,13 @@ def __init__(self, host="localhost", port=4000):
         self.ordered_handlers = []
         self.oneshot_handlers = RequestHandlerList()
         self.handlers = RequestHandlerList()
+        self.permanently_failed = False
 
     def clear(self):
         self.clear_assertions()
         self.clear_log()
         self.clear_all_handlers()
+        self.permanently_failed = False
 
     def clear_assertions(self):
         self.assertions = []
@@ -152,7 +154,7 @@ def url_for(self, suffix: str):
     def create_matcher(self, *args, **kwargs):
         return RequestMatcher(*args, **kwargs)
 
-    def expect_oneshot_request(self, uri, method="GET", data=None, data_encoding="utf-8", headers=None, ordered=False):
+    def expect_oneshot_request(self, uri, method="GET", data=None, data_encoding="utf-8", headers=None, *, ordered=False):
         matcher = self.create_matcher(uri, method=method, data=data, data_encoding=data_encoding, headers=headers)
         request_handler = RequestHandler(matcher)
         if ordered:
@@ -221,13 +223,20 @@ def respond_nohandler(self, request: Request):
         self.add_assertion(text + self.format_matchers())
         return Response("No handler found for this request", 500)
 
+    def respond_permanent_failure(self):
+        self.add_assertion("All requests will be permanently failed due failed ordered handler")
+        return Response("No handler found for this request", 500)
+
     def dispatch(self, request):
+        if self.permanently_failed:
+            return self.respond_permanent_failure()
+
         handler = None
         if self.ordered_handlers:
             handler = self.ordered_handlers[0]
             if not handler.matcher.match(request):
+                self.permanently_failed = True
                 response = self.respond_nohandler(request)
-                self.ordered_handlers.pop(0)
                 return response
 
             self.ordered_handlers.pop(0)
 
@@ -7,7 +7,7 @@
 
 setup(
     name="pytest_httpserver",
-    version="0.2",
+    version="0.1",
     url="https://www.github.com/csernazs/pytest-httpserver",
     packages=find_packages(),
     author="Zsolt Cserna",
 
@@ -58,10 +58,12 @@ def test_ordered_invalid_order(httpserver: HTTPServer):
     assert len(httpserver.ordered_handlers) == 2
 
     # these would not pass as the order is different
+    # this mark the whole thing 'permanently failed' so no further requests must pass
     response = requests.get(httpserver.url_for("/foobaz"))
     assert response.status_code == 500
 
     response = requests.get(httpserver.url_for("/foobar"))
     assert response.status_code == 500
 
-    assert len(httpserver.ordered_handlers) == 0
+    # as no ordered handlers are triggered yet, these must be intact..
+    assert len(httpserver.ordered_handlers) == 2