removed mocker decorator from basic_test.py to fix travis python 3.x build issues

Author: mzuber-r7

test/basic_test.py

@@ -144,54 +144,55 @@ def test_load_logsearch_with_invalid_region():
     assert str(excinfo.value) == "Unrecognised region 'FR' valid regions are [EU, US, CA, AU]"
 
 
-@requests_mock.Mocker()
 def test_simple_query_when_lerest_returns_202_continuation(m):
-    m.get(__API_KEY_URL,
-          request_headers=__API_KEY_HEADER,
-          json={'apikeys': [__LOG_ID]},
-          status_code=200)
-
-    dummy_continuation_link_dict = {
-        'rel': 'Self',
-        'href': __SEARCH_QUERY_RESULTS_URL
-    }
+    with requests_mock.Mocker() as m:
+        m.get(__API_KEY_URL,
+              request_headers=__API_KEY_HEADER,
+              json={'apikeys': [__LOG_ID]},
+              status_code=200)
+
+        dummy_continuation_link_dict = {
+            'rel': 'Self',
+            'href': __SEARCH_QUERY_RESULTS_URL
+        }
 
-    resp_body = {
-        'events': [],
-        'links': [dummy_continuation_link_dict,],
-        'progress': 0
-    }
+        resp_body = {
+            'events': [],
+            'links': [dummy_continuation_link_dict,],
+            'progress': 0
+        }
 
-    m.post(__SEARCH_QUERY_URL,
-           request_headers=__API_KEY_HEADER,
-           status_code=202,
-           json=resp_body)
-
-    m.get(__SEARCH_QUERY_RESULTS_URL, json=__SEARCH_QUERY_RESULTS_RESPONSE_JSON)
-
-    ls = LogSearch(api_key=__API_KEY)
-    query = ls.search(query='where(main) calculate(count)',
-                      log_ids=[__LOG_ID],
-                      time_range='Last 24 Hours',
-                      limit=1)
-    assert query.get_resp().json() == __SEARCH_QUERY_RESULTS_RESPONSE_JSON
-
-@requests_mock.Mocker()
-def test_simple_query_when_lerest_returns_200_no_continuation(m):
-    m.get(__API_KEY_URL,
-          request_headers=__API_KEY_HEADER,
-          json={'apikeys': [__LOG_ID]},
-          status_code=200)
-
-    m.post(__SEARCH_QUERY_URL,
-           request_headers=__API_KEY_HEADER,
-           status_code=200,
-           json=__SEARCH_QUERY_RESULTS_RESPONSE_JSON)
-
-    ls = LogSearch(api_key=__API_KEY)
-
-    query = ls.search(query='where(main) calculate(count)',
-                      log_ids=[__LOG_ID],
-                      time_range='Last 24 Hours',
-                      limit=1)
-    assert query.get_resp().json() == __SEARCH_QUERY_RESULTS_RESPONSE_JSON
+        m.post(__SEARCH_QUERY_URL,
+               request_headers=__API_KEY_HEADER,
+               status_code=202,
+               json=resp_body)
+
+        m.get(__SEARCH_QUERY_RESULTS_URL, json=__SEARCH_QUERY_RESULTS_RESPONSE_JSON)
+
+        ls = LogSearch(api_key=__API_KEY)
+        query = ls.search(query='where(main) calculate(count)',
+                          log_ids=[__LOG_ID],
+                          time_range='Last 24 Hours',
+                          limit=1)
+        assert query.get_resp().json() == __SEARCH_QUERY_RESULTS_RESPONSE_JSON
+
+
+def test_simple_query_when_lerest_returns_200_no_continuation():
+    with requests_mock.Mocker() as m:
+        m.get(__API_KEY_URL,
+              request_headers=__API_KEY_HEADER,
+              json={'apikeys': [__LOG_ID]},
+              status_code=200)
+
+        m.post(__SEARCH_QUERY_URL,
+               request_headers=__API_KEY_HEADER,
+               status_code=200,
+               json=__SEARCH_QUERY_RESULTS_RESPONSE_JSON)
+
+        ls = LogSearch(api_key=__API_KEY)
+
+        query = ls.search(query='where(main) calculate(count)',
+                          log_ids=[__LOG_ID],
+                          time_range='Last 24 Hours',
+                          limit=1)
+        assert query.get_resp().json() == __SEARCH_QUERY_RESULTS_RESPONSE_JSON