From ae65aff707fd65e79e0c821ed6c724a003fb5e00 Mon Sep 17 00:00:00 2001
From: Mario de Frutos <mario.defrutos@cartodb.com>
Date: Sun, 6 Dec 2015 15:01:46 +0100
Subject: [PATCH] Refactor and extract import logic to a helper

---
 test/helpers/import_helper.py | 45 +++++++++++++++++++++++++++++++++++
 test/run_tests.py             | 44 ++++------------------------------
 2 files changed, 50 insertions(+), 39 deletions(-)
 create mode 100644 test/helpers/import_helper.py

diff --git a/test/helpers/import_helper.py b/test/helpers/import_helper.py
new file mode 100644
index 0000000..cb8f6e1
--- /dev/null
+++ b/test/helpers/import_helper.py
@@ -0,0 +1,45 @@
+import os
+import requests
+import json
+
+import time
+
+class ImportHelper:
+
+    @classmethod
+    def import_test_dataset(cls, username, api_key, host):
+        url = "https://{0}.{1}/api/v1/imports/"\
+            "?type_guessing=false&api_key={2}".format(
+            username, host, api_key)
+        dataset = {
+            'file': open('fixtures/geocoder_api_test_dataset.csv', 'rb')}
+        response = requests.post(url, files=dataset)
+        response_json = json.loads(response.text)
+        if not response_json['success']:
+            print "Error importing the test dataset: {0}".format(response.text)
+            sys.exit(1)
+        while(True):
+            table_name = ImportHelper.get_imported_table_name(
+                username,
+                host,
+                api_key,
+                response_json['item_queue_id']
+            )
+            if table_name:
+                return table_name
+            else:
+                time.sleep(5)
+
+    @classmethod
+    def get_imported_table_name(cls, username, host, api_key, import_id):
+        import_url = "https://{0}.{1}/api/v1/imports/{2}?api_key={3}".format(
+            username, host, import_id, api_key)
+        import_data_response = requests.get(import_url)
+        if import_data_response.status_code != 200:
+            print "Error getting the table name from " \
+                "the import data: {0}".format(
+                import_data_response.text)
+            sys.exit(1)
+        import_data_json = json.loads(import_data_response.text)
+
+        return import_data_json['table_name']
diff --git a/test/run_tests.py b/test/run_tests.py
index d106dac..c93b5e3 100644
--- a/test/run_tests.py
+++ b/test/run_tests.py
@@ -5,6 +5,7 @@ import time
 import json
 import subprocess
 import os
+from helpers.import_helper import ImportHelper
 
 
 def main():
@@ -28,9 +29,12 @@ def main():
             assert False, "unhandled option"
 
     try:
-        table_name = import_test_dataset(username, api_key, host)
+        table_name = ImportHelper.import_test_dataset(username, api_key, host)
         set_environment_variables(username, api_key, table_name, host)
         execute_tests()
+    except Exception as e:
+        print e.message
+        sys.exit(1)
     finally:
         clean_environment_variables()
         clean_test_dataset(username, api_key, table_name, host)
@@ -43,44 +47,6 @@ def usage():
         --host: take that host as base (by default is cartodb.com)"""
 
 
-def import_test_dataset(username, api_key, host):
-    url = "https://{0}.{1}/api/v1/imports/"\
-        "?type_guessing=false&api_key={2}".format(
-        username, host, api_key)
-    dataset = {'file': open('fixtures/geocoder_api_test_dataset.csv', 'rb')}
-    response = requests.post(url, files=dataset)
-    response_json = json.loads(response.text)
-    if not response_json['success']:
-        print "Error importing the test dataset: {0}".format(response.text)
-        sys.exit(1)
-    while(True):
-        table_name = get_imported_table_name(
-            username,
-            host,
-            api_key,
-            response_json['item_queue_id']
-        )
-        if table_name:
-            return table_name
-        else:
-            time.sleep(5)
-
-
-def get_imported_table_name(username, host, api_key, import_id):
-    import_data_url = "https://{0}.{1}/api/v1/imports/{2}?api_key={3}".format(
-        username, host, import_id, api_key
-    )
-    import_data_response = requests.get(import_data_url)
-    if import_data_response.status_code != 200:
-        print "Error getting the table name from the import data: {0}".format(
-            import_data_response.text
-        )
-        sys.exit(1)
-    import_data_json = json.loads(import_data_response.text)
-
-    return import_data_json['table_name']
-
-
 def execute_tests():
     print "Start testing..."
     process = subprocess.Popen(["nosetests", "--where=integration/"])