fix previous commit and delete right test

Author: nilsnolde

test/test_client.py

@@ -46,47 +46,45 @@ def test_invalid_api_key(self):
     def test_urlencode(self):
         encoded_params = openrouteservice.client._urlencode_params([("address", "=Sydney ~")])
         self.assertEqual("address=%3DSydney+~", encoded_params)
-
-    # Reactivate this test when secret env variable is set up in Travis
-
-    # @responses.activate
-    # def test_queries_per_minute_sleep_function(self):
-    #     # This test assumes that the time to run a mocked query is
-    #     # relatively small, eg a few milliseconds. We define a rate of
-    #     # 3 queries per second, and run double that, which should take at
-    #     # least 1 minute but no more than 2.
-    #     queries_per_minute = 2
-    #     query_range = range(queries_per_minute * 2)
-    #
-    #     for _ in query_range:
-    #         responses.add(responses.GET,
-    #                       'https://api.openrouteservice.org/directions',
-    #                       body='{"status":"OK","results":[]}',
-    #                       status=200,
-    #                       content_type='application/json')
-    #
-    #     client = openrouteservice.Client(key="58d904a497c67e00015b45fcc8de25513ac6446692280cb066e66e8c",
-    #                                queries_per_minute=queries_per_minute)
-    #     start = time.time()
-    #     for idx, _ in enumerate(query_range):
-    #         client.directions(self.coords_valid)
-    #     end = time.time()
-    #     self.assertTrue(start + 60 < end < start + 120)
 
-    def test_overquerylimit_error(self):
-        # Assume more queries_per_minute than allowed by API policy and 
-        # don't allow retries if API throws 'rate exceeded' error, which 
-        # should be caught.
-        queries_per_minute = 110
+    @responses.activate
+    def test_queries_per_minute_sleep_function(self):
+        # This test assumes that the time to run a mocked query is
+        # relatively small, eg a few milliseconds. We define a rate of
+        # 3 queries per second, and run double that, which should take at
+        # least 1 minute but no more than 2.
+        queries_per_minute = 2
         query_range = range(queries_per_minute * 2)
+        
+        for _ in query_range:
+            responses.add(responses.GET,
+                          'https://api.openrouteservice.org/directions',
+                          body='{"status":"OK","results":[]}',
+                          status=200,
+                          content_type='application/json')
 
-        client = openrouteservice.Client(key='5b3ce3597851110001cf624870cf2f2a58d44c718542b3088221b684',
-                                   queries_per_minute=queries_per_minute,
-                                   retry_over_query_limit=False)
+        client = openrouteservice.Client(key=self.key,
+                                   queries_per_minute=queries_per_minute)
+        start = time.time()
+        for idx, _ in enumerate(query_range):
+            client.directions(self.coords_valid)
+        end = time.time()
+        self.assertTrue(start + 60 < end < start + 120)
 
-        with self.assertRaises(openrouteservice.exceptions._OverQueryLimit):
-            for _ in query_range:
-                client.directions(self.coords_valid)
+    # def test_overquerylimit_error(self):
+    #     # Assume more queries_per_minute than allowed by API policy and
+    #     # don't allow retries if API throws 'rate exceeded' error, which
+    #     # should be caught.
+    #     queries_per_minute = 110
+    #     query_range = range(queries_per_minute * 2)
+    #
+    #     client = openrouteservice.Client(key='5b3ce3597851110001cf624870cf2f2a58d44c718542b3088221b684',
+    #                                queries_per_minute=queries_per_minute,
+    #                                retry_over_query_limit=False)
+    #
+    #     with self.assertRaises(openrouteservice.exceptions._OverQueryLimit):
+    #         for _ in query_range:
+    #             client.directions(self.coords_valid)
 
     @responses.activate
     def test_raise_timeout_retriable_requests(self):