make "python setup.py test" work

shrishailp · Jul 29, 2020 · d966774 · d966774
1 parent 8fdf6b0
commit d966774
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 18 deletions.
diff --git a/setup.py b/setup.py
@@ -7,6 +7,7 @@
 
 import os
 from setuptools import setup, find_packages
+import unittest
 
 
 DOCLINES = (__doc__ or "").split("\n")
@@ -106,7 +107,7 @@ def read(fname):
             "sklearn",
             "textblob",
         ],
-        test_suite="pytest",
+        test_suite="tests",
     )
 
 

diff --git a/tabpy/VERSION b/tabpy/VERSION
@@ -1 +1 @@
-1.2.0
+1.2.0
diff --git a/tabpy/tabpy_server/app/app.py b/tabpy/tabpy_server/app/app.py
@@ -60,7 +60,7 @@ class TabPyApp:
     python_service = None
     credentials = {}
 
-    def __init__(self, config_file=None):
+    def __init__(self, config_file):
         if config_file is None:
             config_file = os.path.join(
                 os.path.dirname(__file__), os.path.pardir, "common", "default.conf"
@@ -243,13 +243,20 @@ def _parse_config(self, config_file):
         pkg_path = os.path.dirname(tabpy.__file__)
 
         parser = configparser.ConfigParser(os.environ)
+        logger.info(f"Parsing config file {config_file}")
 
+        file_exists = False
         if os.path.isfile(config_file):
-            with open(config_file) as f:
-                parser.read_string(f.read())
-        else:
+            try:
+                with open(config_file, 'r') as f:
+                    parser.read_string(f.read())
+                    file_exists = True
+            except Exception:
+                pass
+
+        if not file_exists:
             logger.warning(
-                f"Unable to find config file at {config_file}, "
+                f"Unable to open config file {config_file}, "
                 "using default settings."
             )
 

diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/integration/__init__.py b/tests/integration/__init__.py
diff --git a/tests/integration/test_auth.py b/tests/integration/test_auth.py
@@ -1,5 +1,5 @@
 import base64
-import integ_test_base
+from . import integ_test_base
 
 
 class TestAuth(integ_test_base.IntegTestBase):

diff --git a/tests/integration/test_custom_evaluate_timeout.py b/tests/integration/test_custom_evaluate_timeout.py
@@ -1,4 +1,4 @@
-import integ_test_base
+from . import integ_test_base
 
 
 class TestCustomEvaluateTimeout(integ_test_base.IntegTestBase):

diff --git a/tests/integration/test_deploy_and_evaluate_model.py b/tests/integration/test_deploy_and_evaluate_model.py
@@ -1,4 +1,4 @@
-import integ_test_base
+from . import integ_test_base
 
 
 class TestDeployAndEvaluateModel(integ_test_base.IntegTestBase):

diff --git a/tests/integration/test_deploy_and_evaluate_model_ssl.py b/tests/integration/test_deploy_and_evaluate_model_ssl.py
@@ -1,4 +1,4 @@
-import integ_test_base
+from . import integ_test_base
 import requests
 
 

diff --git a/tests/integration/test_deploy_model_ssl_off_auth_off.py b/tests/integration/test_deploy_model_ssl_off_auth_off.py
@@ -1,4 +1,4 @@
-import integ_test_base
+from . import integ_test_base
 
 
 class TestDeployModelSSLOffAuthOff(integ_test_base.IntegTestBase):

diff --git a/tests/integration/test_deploy_model_ssl_off_auth_on.py b/tests/integration/test_deploy_model_ssl_off_auth_on.py
@@ -1,4 +1,4 @@
-import integ_test_base
+from . import integ_test_base
 import base64
 
 

diff --git a/tests/integration/test_deploy_model_ssl_on_auth_off.py b/tests/integration/test_deploy_model_ssl_on_auth_off.py
@@ -1,4 +1,4 @@
-import integ_test_base
+from . import integ_test_base
 import requests
 
 

diff --git a/tests/integration/test_deploy_model_ssl_on_auth_on.py b/tests/integration/test_deploy_model_ssl_on_auth_on.py
@@ -1,4 +1,4 @@
-import integ_test_base
+from . import integ_test_base
 import base64
 import requests
 

diff --git a/tests/integration/test_evaluate.py b/tests/integration/test_evaluate.py
@@ -2,7 +2,7 @@
 Script evaluation tests.
 """
 
-import integ_test_base
+from . import integ_test_base
 import json
 
 

diff --git a/tests/integration/test_url.py b/tests/integration/test_url.py
@@ -2,7 +2,7 @@
 All other misc. URL-related integration tests.
 """
 
-import integ_test_base
+from . import integ_test_base
 
 
 class TestURL(integ_test_base.IntegTestBase):

diff --git a/tests/integration/test_url_ssl.py b/tests/integration/test_url_ssl.py
@@ -3,7 +3,7 @@
 when SSL is turned on for TabPy.
 """
 
-import integ_test_base
+from . import integ_test_base
 import requests
 
 

diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
diff --git a/tests/unit/server_tests/__init__.py b/tests/unit/server_tests/__init__.py