update tests for travis

derwentx · derwentx · commit 6ce9fbe5aebb · 2018-08-10T14:20:19.000+10:00
diff --git a/.travis.yml b/.travis.yml
@@ -11,4 +11,5 @@ install:
   - pip install .
   - pip install -r requirements-test.txt
 # command to run tests
-script: nosetests
+script:
+  - pytest
diff --git a/requirements-test.txt b/requirements-test.txt
@@ -2,3 +2,4 @@
 httmock==1.2.3
 nose==1.3.7
 six
+pytest
diff --git a/tests.py b/tests.py
@@ -858,18 +858,18 @@ def test_retrieve_access_creds(self):
             'YYYYYYYYYYYY'
         )
 
-@unittest.skipIf(platform.uname()[1] != "Derwents-MBP.lan", "should only work on my machine")
+@unittest.skipIf(platform.uname()[1] != "Derwents-MacBook-Pro.local", "should only work on my machine")
 class WCApiTestCasesBase(unittest.TestCase):
     """ Base class for WC API Test cases """
     def setUp(self):
         Auth.force_timestamp = CURRENT_TIMESTAMP
         Auth.force_nonce = SHITTY_NONCE
         self.api_params = {
-            'url':'http://localhost:18080/wptest/',
+            'url':'http://derwent-mac.ddns.me:18080/wptest/',
             'api':'wc-api',
             'version':'v3',
-            'consumer_key':'ck_e1dd4a9c85f49b9685f7964a154eecb29af39d5a',
-            'consumer_secret':'cs_8ef3e5d21f8a0c28cd7bc4643e92111a0326b6b1',
+            'consumer_key':'ck_6f1cf1a528fd94ec3d18a8af91eea94cfc8233bf',
+            'consumer_secret':'cs_d9055bdeff59dc992105064f4607de0ffa05ca5e',
         }
 
 class WCApiTestCasesLegacy(WCApiTestCasesBase):
@@ -975,14 +975,14 @@ class WCApiTestCases3Leg(WCApiTestCases):
     """ Tests for New wp-json/wc/v2 API with 3-leg """
     oauth1a_3leg = True
 
-@unittest.skipIf(platform.uname()[1] != "Derwents-MBP.lan", "should only work on my machine")
+@unittest.skipIf(platform.uname()[1] != "Derwents-MacBook-Pro.local", "should only work on my machine")
 class WPAPITestCasesBase(unittest.TestCase):
     def setUp(self):
         Auth.force_timestamp = CURRENT_TIMESTAMP
         Auth.force_nonce = SHITTY_NONCE
         self.creds_store = '~/wc-api-creds-test.json'
         self.api_params = {
-            'url':'http://localhost:18080/wptest/',
+            'url':'http://derwent-mac.ddns.me:18080/wptest/',
             'api':'wp-json',
             'version':'wp/v2',
             'consumer_key':'tYG1tAoqjBEM',
diff --git a/wordpress/api.py b/wordpress/api.py
@@ -100,21 +100,24 @@ def request_post_mortem(self, response=None):
             if hasattr(response.request, 'body'):
                 request_body = response.request.body
 
+        try_hostname_mismatch = False
+
         if isinstance(response_json, dict) and ('code' in response_json or 'message' in response_json):
             reason = u" - ".join([
                 unicode(response_json.get(key)) for key in ['code', 'message', 'data'] \
                 if key in response_json
             ])
+            code = response_json.get('code')
 
-            if 'code' == 'rest_user_invalid_email':
+            if code == 'rest_user_invalid_email':
                 remedy = "Try checking the email %s doesn't already exist" % \
                 request_body.get('email')
 
-            elif 'code' == 'json_oauth1_consumer_mismatch':
+            elif code == 'json_oauth1_consumer_mismatch':
                 remedy = "Try deleting the cached credentials at %s" % \
                 self.auth.creds_store
 
-            elif 'code' == 'woocommerce_rest_cannot_view':
+            elif code == 'woocommerce_rest_cannot_view':
                 if not self.auth.query_string_auth:
                     remedy = "Try enabling query_string_auth"
                 else:
@@ -131,14 +134,21 @@ def request_post_mortem(self, response=None):
                         " - Try enabling HTTPS and using basic authentication\n"
                     )
 
+            elif code == 'woocommerce_rest_authentication_error':
+                try_hostname_mismatch = True
+
         response_headers = {}
         if hasattr(response, 'headers'):
             response_headers = response.headers
 
-        if not reason:
+        if not reason or try_hostname_mismatch:
             requester_api_url = self.requester.api_url
+            links = []
             if hasattr(response, 'links') and response.links:
                 links = response.links
+            elif 'Link' in response_headers:
+                links = [response_headers['Link']]
+            if links:
                 first_link_key = list(links)[0]
                 header_api_url = links[first_link_key].get('url', '')
                 if header_api_url:
