Add verify method, now we can verify requests without adding them to

expectations dict.

(cherry picked from commit f728850)

Author: Evgeniy Semenov

mockserver_friendly/__init__.py

@@ -28,13 +28,16 @@ def expect(self, request, response, timing, time_to_live=None):
         self.stub(request, response, timing, time_to_live)
         self.expectations.append((request, timing))
 
-    def verify(self):
+    def verify(self, request, timing=1):
+        result = self._call("verify", json.dumps({
+            "httpRequest": request,
+            "times": timing.for_verification()
+        }))
+        assert result.status_code == 202, result.content.decode("UTF-8").replace("\n", "\r\n")
+
+    def verify_expectations(self):
         for req, timing in self.expectations:
-            result = self._call("verify", json.dumps({
-                "httpRequest": req,
-                "times": timing.for_verification()
-            }))
-            assert result.status_code == 202, result.content.decode('UTF-8').replace('\n', '\r\n')
+            self.verify(req, timing)
 
 
 def request(method=None, path=None, querystring=None, body=None, headers=None, cookies=None):

test/test_basic_expectations.py

@@ -12,7 +12,7 @@ def test_expect_once_not_called_fails(self):
         )
 
         with self.assertRaises(AssertionError):
-            self.client.verify()
+            self.client.verify_expectations()
 
     def test_expect_once_called_twice_fails(self):
         self.client.expect(
@@ -34,7 +34,7 @@ def test_expect_never(self):
             times(0)
         )
 
-        self.client.verify()
+        self.client.verify_expectations()
 
     def test_reset_should_clear_expectations(self):
         self.client.expect(
@@ -44,7 +44,7 @@ def test_reset_should_clear_expectations(self):
         )
 
         self.client.reset()
-        self.client.verify()
+        self.client.verify_expectations()
 
     def test_expect_with_ttl(self):
         self.client.expect(