fix import error and add check() method

thrau · thrau · commit 5158590ab3a9 · 2021-07-29T13:06:17.000+02:00
diff --git a/pytest_httpserver/httpserver.py b/pytest_httpserver/httpserver.py
@@ -906,6 +906,15 @@ def add_assertion(self, obj):
         """
         self.assertions.append(obj)
 
+    def check(self):
+        """
+        Raises AssertionError or Errors raised in handlers.
+
+        Runs both :py:meth:`check_assertions` and :py:meth:`check_handler_errors`
+        """
+        self.check_assertions()
+        self.check_handler_errors()
+
     def check_assertions(self):
         """
         Raise AssertionError when at least one assertion added
@@ -925,6 +934,12 @@ def check_assertions(self):
             raise AssertionError(assertion)
 
     def check_handler_errors(self):
+        """
+        Re-Raises any errors caused in request handlers
+
+        The first error raised by a handler will be re-raised here, and then
+        removed from the list.
+        """
         if self.handler_errors:
             raise self.handler_errors.pop(0)
 
diff --git a/tests/test_handler_errors.py b/tests/test_handler_errors.py
@@ -2,7 +2,7 @@
 import requests
 import werkzeug
 
-from pytest_httpserver import HTTPServer, Error
+from pytest_httpserver import HTTPServer
 
 
 def test_check_assertions_raises_handler_assertions(httpserver: HTTPServer):
@@ -65,3 +65,28 @@ def test_missing_matcher_raises_exception(httpserver):
 
     with pytest.raises(AssertionError):
         httpserver.check_assertions()
+
+
+def test_check_raises_errors_in_order(httpserver):
+    def handler1(_):
+        assert 1 == 2
+
+    def handler2(_):
+        pass  # does nothing
+
+    def handler3(_):
+        raise ValueError
+
+    httpserver.expect_request("/foobar1").respond_with_handler(handler1)
+    httpserver.expect_request("/foobar2").respond_with_handler(handler2)
+    httpserver.expect_request("/foobar3").respond_with_handler(handler3)
+
+    requests.get(httpserver.url_for("/foobar1"))
+    requests.get(httpserver.url_for("/foobar2"))
+    requests.get(httpserver.url_for("/foobar3"))
+
+    with pytest.raises(AssertionError):
+        httpserver.check()
+
+    with pytest.raises(ValueError):
+        httpserver.check()
