Get proxy test to run with unittest discover

Author: BryceStevenWilley

docassemble/EFSPIntegration/conversions.py

@@ -408,7 +408,7 @@ def chain_xml(xml_val, elems: List[Union[str, int]]):
     val = xml_val
     for idx, elem in enumerate(elems):
         if not val:
-            log(f"No {elem} ({idx}) in {xml_val} ({elems})")
+            log(f"No `{elem}` ({idx}) in `{xml_val}` ({elems})")
             return None
         if isinstance(val, dict):
             val = val.get(elem) or {}

…EFSPIntegration/test/integration_test.py …/EFSPIntegration/test/test_proxy_conn.pydocassemble/EFSPIntegration/test/integration_test.py renamed to docassemble/EFSPIntegration/test/test_proxy_conn.py docassemble/EFSPIntegration/test/integration_test.py renamed to docassemble/EFSPIntegration/test/test_proxy_conn.py

@@ -22,9 +22,8 @@
 
 jurisdiction = "illinois"  # 'massachusetts'
 
-base_url = None  # From Env var
-api_key = None  # From Env var
-
+base_url = os.getenv("PROXY_URL")
+api_key = os.getenv("PROXY_API_KEY")
 
 def mock_person():
     per = {}
@@ -49,6 +48,9 @@ def mock_person():
 class BadAuth(unittest.TestCase):
 
     def test_misconfigured_proxy(self):
+        if not base_url:
+            print("Need to pass the Proxy Server URL")
+            exit(1)
         bad_proxy = EfspConnection(
             url=base_url,
             api_key="IntenionallyWrongKey",
@@ -58,6 +60,17 @@ def test_misconfigured_proxy(self):
         self.assertEqual(intentional_bad_resp.response_code, 403)
         bad_proxy.proxy_client.close()
 
+    def test_good_but_no_password_proxy(self):
+        good_proxy = EfspConnection(
+            url=base_url,
+            api_key=api_key,
+            default_jurisdiction=jurisdiction,
+        )
+
+        empty_resp = good_proxy.authenticate_user()
+        self.assertTrue(empty_resp.is_ok())
+        self.assertEqual(empty_resp.data["tokens"], {})
+
 
 class TestClass(unittest.TestCase):
 
@@ -74,14 +87,16 @@ def setUp(self):
         # Actual setup
         self.user_email = os.getenv("TYLER_USER_EMAIL")
         self.user_password = os.getenv("TYLER_USER_PASSWORD")
-        api_key = os.getenv("PROXY_API_KEY")
+        if not base_url:
+            print("Need to pass the Proxy Server URL")
+            exit(1)
         if not api_key:
             print("You need to have the PROXY_API_KEY env var set; not running tests")
             exit(2)
         self.proxy_conn = EfspConnection(
             url=base_url, api_key=api_key, default_jurisdiction=jurisdiction
         )
-        self.proxy_conn.set_verbose_logging(verbose)
+        self.proxy_conn.set_verbose_logging(self.verbose)
         self.setup_authenticate()
 
     def tearDown(self):
@@ -95,9 +110,6 @@ def basic_assert(self, resp: ApiResponse):
 
     def setup_authenticate(self):
         print("\n\n### Authenticate ###\n\n")
-        empty_resp = self.proxy_conn.authenticate_user()
-        self.basic_assert(empty_resp)
-        self.assertEqual(empty_resp.data["tokens"], [])
         resp = self.proxy_conn.authenticate_user(
             tyler_email=self.user_email, tyler_password=self.user_password
         )
@@ -233,7 +245,7 @@ def test_service_contacts(self):
         )
 
         my_list = self.basic_assert(self.proxy_conn.get_service_contact_list())
-        self.assertGreaterThan(len(my_list.data), 1)
+        self.assertGreater(len(my_list.data), 1)
         updated_contact = self.basic_assert(
             self.proxy_conn.get_service_contact(contact_id)
         )
@@ -519,8 +531,4 @@ def test_logs(self):
 
 
 if __name__ == "__main__":
-    base_url = os.getenv("PROXY_URL")
-    if not base_url:
-        print("Need to pass the Proxy Server URL")
-        exit(1)
     unittest.main()

setup.py

@@ -1,5 +1,5 @@
 import os
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 from fnmatch import fnmatchcase
 from distutils.util import convert_path
 
@@ -50,8 +50,7 @@ def find_package_data(where='.', package='', exclude=standard_exclude, exclude_d
       author_email='bwilley@suffolk.edu',
       license='The MIT License (MIT)',
       url='https://github.com/SuffolkLITLab/docassemble-EFSPIntegration',
-      packages=find_packages(),
-      namespace_packages=['docassemble'],
+      packages=find_namespace_packages(),
       install_requires=['docassemble.AssemblyLine>=2.18.0', 'docassemble.ALToolbox>=0.6.2', 'requests>=2.25.1'],
       zip_safe=False,
       package_data=find_package_data(where='docassemble/EFSPIntegration/', package='docassemble.EFSPIntegration'),