Record HTTP requests/response communication in integration tests (#521)

DataDog · Feb 4, 2020 · 331a79c · 331a79c
1 parent 059fcb2
commit 331a79c
Show file tree

Hide file tree

Showing 96 changed files with 22,019 additions and 438 deletions.
diff --git a/.azure-pipelines/integration_tests.yml b/.azure-pipelines/integration_tests.yml
@@ -16,13 +16,13 @@ jobs:
       versionSpec: "3.7"
   - script: pip install tox
     displayName: Install tox
-  - script: tox -e integration
+  - script: tox -e integration -- --vcr-record=all
     displayName: Run integration tests
     env:
       DD_TEST_CLIENT_API_KEY: $(datadogAPIKey)
       DD_TEST_CLIENT_APP_KEY: $(datadogAPPKey)
       DD_TEST_CLIENT_USER: $(datadogTestUser)
-  - script: tox -e integration-admin
+  - script: tox -e integration-admin -- --vcr-record=all
     displayName: Run admin integration tests
     env:
       DD_TEST_CLIENT_API_KEY: $(datadogAPIKey)

diff --git a/.azure-pipelines/unit_tests.yml b/.azure-pipelines/unit_tests.yml
@@ -48,3 +48,7 @@ jobs:
     displayName: Install tox
   - script: tox
     displayName: Run unit tests
+  - script: tox -e integration -- --vcr-record=none
+    displayName: Run integration tests on cassettes
+  - script: tox -e integration-admin -- --vcr-record=none
+    displayName: Run admin integration tests on cassettes
diff --git a/datadog/api/api_client.py b/datadog/api/api_client.py
@@ -34,6 +34,7 @@ class APIClient(object):
     _max_timeouts = _max_timeouts
     _backoff_timestamp = None
     _timeout_counter = 0
+    _sort_keys = False
 
     # Plugged HTTP client
     _http_client = None
@@ -145,7 +146,7 @@ def submit(cls, method, path, api_version=None, body=None, attach_host_name=Fals
 
             # Process the body, if necessary
             if isinstance(body, dict):
-                body = json.dumps(body)
+                body = json.dumps(body, sort_keys=cls._sort_keys)
                 headers['Content-Type'] = 'application/json'
 
             if compress_payload:

diff --git a/datadog/dogshell/common.py b/datadog/dogshell/common.py
@@ -16,6 +16,7 @@ def print_err(msg):
         print(msg + '\n', file=sys.stderr)
     else:
         sys.stderr.write(msg + '\n')
+    sys.stderr.flush()
 
 
 def report_errors(res):