Add verify method tests

(cherry picked from commit 13471b6)

Author: Evgeniy Semenov

mockserver_friendly/__init__.py

@@ -28,7 +28,7 @@ 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, request, timing=1):
+    def verify(self, request, timing):
         result = self._call("verify", json.dumps({
             "httpRequest": request,
             "times": timing.for_verification()

test/test_basic_expectations.py

@@ -4,16 +4,6 @@
 
 
 class TestBasicExpectations(MockServerClientTestCase):
-    def test_expect_once_not_called_fails(self):
-        self.client.expect(
-            request(),
-            response(),
-            times(1)
-        )
-
-        with self.assertRaises(AssertionError):
-            self.client.verify_expectations()
-
     def test_expect_once_called_twice_fails(self):
         self.client.expect(
             request(),
@@ -27,15 +17,6 @@ def test_expect_once_called_twice_fails(self):
         result = requests.get(MOCK_SERVER_URL + "/path")
         self.assertEqual(result.status_code, 404)
 
-    def test_expect_never(self):
-        self.client.expect(
-            request(),
-            response(),
-            times(0)
-        )
-
-        self.client.verify_expectations()
-
     def test_reset_should_clear_expectations(self):
         self.client.expect(
             request(),

test/test_basic_verifying.py

@@ -0,0 +1,21 @@
+import requests
+from mockserver import request, response, times
+from test import MOCK_SERVER_URL, MockServerClientTestCase
+
+
+class TestBasicVerifying(MockServerClientTestCase):
+    def test_verify_request_recived_once(self):
+        requests.get(MOCK_SERVER_URL)
+        self.client.verify(request(), times(1))
+
+    def test_verify_request_never_recived(self):
+        self.client.verify(request(), times(0))
+
+    def test_verify_request_not_recived_fail(self):
+        with self.assertRaises(AssertionError):
+            self.client.verify(request(), times(1))
+
+    def test_verify_all_expectations(self):
+        self.client.expect(request(), response(), times(1))
+        requests.get(MOCK_SERVER_URL)
+        self.client.verify_expectations()