fix(tests): multiple (#50)

a-ghag · web-flow · commit 7fdefa798b1e · 2021-06-30T14:04:21.000-04:00
* fix incorrect test_context for engines
* use ANALYTICS_API_QAR_USERNAME_SERIAL &amp; ANALYTICS_API_QAR_PASSWORD environment variables
* update requirements.txt with latest dependencies
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -1,8 +1,8 @@
 name: CI
 
 env:
-  ANALYTICS_API_USERNAME_SERIAL: ${{ secrets.ANALYTICS_API_USERNAME_SERIAL }}
-  ANALYTICS_API_PASSWORD: ${{ secrets.ANALYTICS_API_PASSWORD }}
+  ANALYTICS_API_QAR_USERNAME_SERIAL: ${{ secrets.ANALYTICS_API_QAR_USERNAME_SERIAL }}
+  ANALYTICS_API_QAR_PASSWORD: ${{ secrets.ANALYTICS_API_QAR_PASSWORD }}
 
 on:
   push:
@@ -17,10 +17,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     
-    - name: Set up Python 3.6
+    - name: Set up Python 3.8
       uses: actions/setup-python@v2
       with:
-        python-version: 3.6
+        python-version: 3.8
     
     - name: Build and install new SDK
       run: |
diff --git a/examples/afi_optimizer_example.py b/examples/afi_optimizer_example.py
@@ -18,8 +18,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/axp_optimizer_example.py b/examples/axp_optimizer_example.py
@@ -20,8 +20,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/bpm_optimizer_example.py b/examples/bpm_optimizer_example.py
@@ -18,8 +18,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/fi_example.py b/examples/fi_example.py
@@ -17,8 +17,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/fpo_optimizer_example.py b/examples/fpo_optimizer_example.py
@@ -21,8 +21,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/pa_engine_multiple_unit_example.py b/examples/pa_engine_multiple_unit_example.py
@@ -19,8 +19,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/pa_engine_single_unit_example.py b/examples/pa_engine_single_unit_example.py
@@ -19,8 +19,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/pub_engine_multiple_unit_example.py b/examples/pub_engine_multiple_unit_example.py
@@ -14,8 +14,8 @@
 from pathlib import Path
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/pub_engine_single_unit_example.py b/examples/pub_engine_single_unit_example.py
@@ -14,8 +14,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/quant_engine_single_unit_example.py b/examples/quant_engine_single_unit_example.py
@@ -20,8 +20,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/quant_engine_single_unit_feather_example.py b/examples/quant_engine_single_unit_feather_example.py
@@ -18,8 +18,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/spar_engine_multiple_unit_example.py b/examples/spar_engine_multiple_unit_example.py
@@ -19,8 +19,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/spar_engine_single_unit_example.py b/examples/spar_engine_single_unit_example.py
@@ -19,8 +19,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/vault_engine_multiple_unit_example.py b/examples/vault_engine_multiple_unit_example.py
@@ -20,8 +20,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/examples/vault_engine_single_unit_example.py b/examples/vault_engine_single_unit_example.py
@@ -20,8 +20,8 @@
 from urllib3 import Retry
 
 host = "https://api.factset.com"
-username = os.environ["ANALYTICS_API_USERNAME_SERIAL"]
-password = os.environ["ANALYTICS_API_PASSWORD"]
+username = os.environ["ANALYTICS_API_QAR_USERNAME_SERIAL"]
+password = os.environ["ANALYTICS_API_QAR_PASSWORD"]
 
 
 def main():
diff --git a/tests/common_functions.py b/tests/common_functions.py
@@ -16,4 +16,4 @@ def build_api_client():
 
             return ApiClient(config)
 
-        raise ValueError("Please set ANALYTICS_API_USERNAME_SERIAL and ANALYTICS_API_PASSWORD environment variables.")
+        raise ValueError("Please set ANALYTICS_API_QAR_USERNAME_SERIAL and ANALYTICS_API_QAR_PASSWORD environment variables.")
diff --git a/tests/common_parameters.py b/tests/common_parameters.py
@@ -1,9 +1,9 @@
 import os
 
-# Set 'ANALYTICS_API_USERNAME_SERIAL' environment variable with username-serial as value
-user_name = os.getenv("ANALYTICS_API_USERNAME_SERIAL")
-# Set 'ANALYTICS_API_PASSWORD' environment variable with the api key generated on developer portal
-password = os.getenv("ANALYTICS_API_PASSWORD")
+# Set 'ANALYTICS_API_QAR_USERNAME_SERIAL' environment variable with username-serial as value
+user_name = os.getenv("ANALYTICS_API_QAR_USERNAME_SERIAL")
+# Set 'ANALYTICS_API_QAR_PASSWORD' environment variable with the api key generated on developer portal
+password = os.getenv("ANALYTICS_API_QAR_PASSWORD")
 
 # Set 'ANALYTICS_API_URL' environment variable with api url as value
 base_url = 'https://api.factset.com' if not os.getenv("ANALYTICS_API_URL") else os.getenv("ANALYTICS_API_URL")
diff --git a/tests/requirements.txt b/tests/requirements.txt
@@ -1 +1,26 @@
-fds.protobuf.stach <2.0.0
+astroid==2.6.2
+atomicwrites==1.4.0
+attrs==21.2.0
+colorama==0.4.4
+fds.analyticsapi.engines<6.0.0
+fds.protobuf.stach<2.0.0
+fds.protobuf.stach.extensions<2.0.0
+fds.protobuf.stach.v2<2.0.0
+iniconfig==1.1.1
+isort==5.9.1
+lazy-object-proxy==1.6.0
+mccabe==0.6.1
+packaging==20.9
+pandas==1.2.5
+pluggy==0.13.1
+protobuf==3.17.3
+py==1.10.0
+pylint==2.9.1
+pyparsing==2.4.7
+pytest==6.2.4
+python-dateutil==2.8.1
+pytz==2021.1
+six==1.16.0
+toml==0.10.2
+urllib3==1.26.6
+wrapt==1.12.1
diff --git a/tests/test_pa_calculations_api.py b/tests/test_pa_calculations_api.py
@@ -84,7 +84,7 @@ def read_calculation_status(test_context):
                 time.sleep(int(max_age))
                 status_response = self.pa_calculations_api.get_calculation_status_by_id(id=calculation_id)
 
-                test_context["calculation_units"] = list(status_response[0].data.units)[0]
+                test_context["calculation_units"] = status_response[0].data.units.items()
 
             return {
                 "continue_workflow": True,
@@ -94,7 +94,7 @@ def read_calculation_status(test_context):
 
         def read_calculation_unit_result(test_context):
             calculation_id = test_context["calculation_id"]
-            for (calculation_unit_id, calculation_unit) in test_context.calculation_units:
+            for (calculation_unit_id, calculation_unit) in test_context["calculation_units"]:
                 result_response = self.pa_calculations_api.get_calculation_unit_result_by_id(id=calculation_id,
                                                                                              unit_id=calculation_unit_id)
                 self.assertEqual(
diff --git a/tests/test_pub_calculations_api.py b/tests/test_pub_calculations_api.py
@@ -72,8 +72,7 @@ def read_calculation_status(test_context):
                 time.sleep(int(max_age))
                 status_response = self.pub_calculations_api.get_calculation_status_by_id(id=calculation_id)
 
-                test_context["calculation_units"] = status_response[0].data.units.items()[
-                    0]
+                test_context["calculation_units"] = status_response[0].data.units.items()
 
             return {
                 "continue_workflow": True,
@@ -83,7 +82,7 @@ def read_calculation_status(test_context):
 
         def read_calculation_unit_result(test_context):
             calculation_id = test_context["calculation_id"]
-            for (calculation_unit_id, calculation_unit) in test_context.calculation_units:
+            for (calculation_unit_id, calculation_unit) in test_context["calculation_units"]:
                 result_response = self.pub_calculations_api.get_calculation_unit_result_by_id(id=calculation_id,
                                                                                              unit_id=calculation_unit_id)
                 self.assertEqual(
diff --git a/tests/test_spar_calculations_api.py b/tests/test_spar_calculations_api.py
@@ -10,6 +10,7 @@
 from fds.analyticsapi.engines.model.spar_date_parameters import SPARDateParameters
 
 from common_functions import CommonFunctions
+from api_workflow import run_api_workflow_with_assertions
 
 
 class TestSparCalculationsApi(unittest.TestCase):
@@ -44,7 +45,8 @@ def create_calculation(test_context):
                 data=spar_calculation_parameters)
 
             post_and_calculate_response = self.spar_calculations_api.post_and_calculate(
-                spar_calculation_parameters_root=spar_calculation_parameter_root
+                spar_calculation_parameters_root=spar_calculation_parameter_root,
+                cache_control='max-stale=0'
             )
 
             self.assertTrue(post_and_calculate_response[1] == 201 or post_and_calculate_response[1] == 202,
@@ -83,8 +85,7 @@ def read_calculation_status(test_context):
                 time.sleep(int(max_age))
                 status_response = self.spar_calculations_api.get_calculation_status_by_id(id=calculation_id)
 
-                test_context["calculation_units"] = status_response[0].data.units.items()[
-                    0]
+                test_context["calculation_units"] = status_response[0].data.units.items()
 
             return {
                 "continue_workflow": True,
@@ -94,7 +95,7 @@ def read_calculation_status(test_context):
 
         def read_calculation_unit_result(test_context):
             calculation_id = test_context["calculation_id"]
-            for (calculation_unit_id, calculation_unit) in test_context.calculation_units:
+            for (calculation_unit_id, calculation_unit) in test_context["calculation_units"]:
                 result_response = self.spar_calculations_api.get_calculation_unit_result_by_id(id=calculation_id,
                                                                                                unit_id=calculation_unit_id)
                 self.assertEqual(
@@ -111,15 +112,5 @@ def read_calculation_unit_result(test_context):
             workflow_specification, starting_request, test_context)
 
 
-def run_api_workflow_with_assertions(workflow_specification, current_request, test_context):
-    current_request_result = current_request(test_context)
-    if current_request_result["continue_workflow"]:
-        run_api_workflow_with_assertions(
-            workflow_specification,
-            current_request_result["next_request"],
-            current_request_result["test_context"]
-        )
-
-
 if __name__ == '__main__':
     unittest.main(failfast=True)
diff --git a/tests/test_vault_calculations_api.py b/tests/test_vault_calculations_api.py
@@ -91,8 +91,7 @@ def read_calculation_status(test_context):
                 time.sleep(int(max_age))
                 status_response = self.vault_calculations_api.get_calculation_status_by_id(id=calculation_id)
 
-                test_context["calculation_units"] = status_response[0].data.units.items()[
-                    0]
+                test_context["calculation_units"] = status_response[0].data.units.items()
 
             return {
                 "continue_workflow": True,
@@ -102,7 +101,7 @@ def read_calculation_status(test_context):
 
         def read_calculation_unit_result(test_context):
             calculation_id = test_context["calculation_id"]
-            for (calculation_unit_id, calculation_unit) in test_context.calculation_units:
+            for (calculation_unit_id, calculation_unit) in test_context["calculation_units"]:
                 result_response = self.vault_calculations_api.get_calculation_unit_result_by_id(id=calculation_id,
                                                                                                 unit_id=calculation_unit_id)
                 self.assertEqual(
