Merge pull request #76 from CartoDB/local_testing_configuration

Added HOST and PROTOCOL to test configuration, allowing local testing

Author: juanignaciosl

NEWS

@@ -1,3 +1,6 @@
+Feb-21-2018: version 1.2.0
+ - Added PROTOCOL and HOST to test configuration allowing local testing.
+
 Dec-27-2017: version 1.1.2
  - Fix on examples management of environment variables (#70)
  - Fix onpremises tests (#70)

carto/datasets.py

@@ -182,7 +182,7 @@ def create(self, archive, interval=None, **import_args):
         import_job.refresh()
 
         count = 0
-        while import_job.state in ("enqueued", "pending", "uploading",
+        while import_job.state in ("enqueued", "queued", "pending", "uploading",
                                    "unpacking", "importing", "guessing") \
             or (isinstance(manager, SyncTableJobManager)
                 and import_job.state == "created"):

tests/conftest.py

@@ -7,6 +7,16 @@
 from carto.users import UserManager
 from mocks import MockRequests, NotMockRequests
 
+if "PROTOCOL" in os.environ:
+    PROTOCOL = os.environ["PROTOCOL"]
+else:
+    from secret import PROTOCOL
+
+if "HOST" in os.environ:
+    HOST = os.environ["HOST"]
+else:
+    from secret import HOST
+
 if "API_KEY" in os.environ:
     API_KEY = os.environ["API_KEY"]
 else:
@@ -42,13 +52,18 @@
 else:
     from secret import ONPREM_API_KEY
 
-BASE_URL = "https://{organization}.carto.com/user/{user}/". \
-    format(organization=ORGANIZATION,
+BASE_URL = "{protocol}://{organization}.{host}/user/{user}/". \
+    format(protocol=PROTOCOL,
+           host=HOST,
+           organization=ORGANIZATION,
            user=USERNAME)
 ONPREMISES_USR_BASE_URL = "https://{onpremises}/user/{onpremuser}/". \
     format(onpremises=ONPREMISES,
            onpremuser=ONPREM_USERNAME)
-USR_BASE_URL = "https://{user}.carto.com/".format(user=USERNAME)
+USR_BASE_URL = "{protocol}://{user}.{host}/". \
+    format(protocol=PROTOCOL,
+           host=HOST,
+           user=USERNAME)
 
 
 @pytest.fixture(scope="session")

tests/secret.py.example

@@ -3,6 +3,8 @@
 # Make sure you put the actual values in a file called secret.py
 
 # CARTO account, please fill in
+PROTOCOL = "https"
+HOST = "carto.com"
 ORGANIZATION = "mock-org"
 USERNAME = "mock"
 API_KEY = "mockmockmock"