fixed tests

Author: jeffreyaven

README.rst

@@ -161,6 +161,7 @@ Before testing, ensure you have all the required packages installed:
 ::
 
     pip install -r requirements.txt
+    pip install psycopg2-binary
 
 Once the dependencies are installed, you can run the tests using the provided script:
 

tests/pystackql_tests.py

@@ -41,6 +41,9 @@ def setUpModule():
     print("downloading aws provider for tests...")
     res = PyStackQLTestsBase.stackql.executeStmt(registry_pull_aws_query)
     print(res)
+    print("downloading awscc provider for tests...")
+    res = PyStackQLTestsBase.stackql.executeStmt(registry_pull_awscc_query)
+    print(res)    
     print("downloading google provider for tests...")
     res = PyStackQLTestsBase.stackql.executeStmt(registry_pull_google_query)
     print(res)
@@ -201,8 +204,8 @@ def test_12_execute_with_pandas_output(self):
         self.assertTrue(is_valid_dataframe, f"Result is not a valid DataFrame: {result}")
         # Check datatypes of the columns
         expected_dtypes = {
-            'instance_state': 'object',  # This should be 'object' for older Pandas versions
-            'num_instances': 'int64'
+            'year': 'int64',
+            'num_buckets': 'int64'
         }
         for col, expected_dtype in expected_dtypes.items():
             actual_dtype = result[col].dtype
@@ -280,8 +283,8 @@ def test_22_execute_server_mode_pandas_output(self):
         self.assertTrue(is_valid_dataframe, f"Result is not a valid DataFrame: {result}")
         # Check datatypes of the columns
         expected_dtypes = {
-            'instance_state': 'object',  # This should be 'object' for older Pandas versions
-            'num_instances': 'int64'
+            'year': 'int64',
+            'num_buckets': 'int64'
         }
         for col, expected_dtype in expected_dtypes.items():
             actual_dtype = result[col].dtype

tests/test_params.py

@@ -27,6 +27,7 @@ def get_custom_download_dir(platform_name):
 
 registry_pull_google_query = "REGISTRY PULL google"
 registry_pull_aws_query = "REGISTRY PULL aws"
+registry_pull_awscc_query = "REGISTRY PULL awscc"
 registry_pull_okta_query = "REGISTRY PULL okta"
 registry_pull_github_query = "REGISTRY PULL github"
 
@@ -43,21 +44,18 @@ def registry_pull_resp_pattern(provider):
 
 aws_query = f"""
 SELECT 
-split_part(instanceState, '\n', 3) as instance_state,
-count(*) as num_instances
-FROM aws.ec2.instances 
-WHERE region = '{os.environ['AWS_REGION']}'
-GROUP BY instance_state
+SPLIT_PART(CreationDate, '-', 1) as year, count(*) as num_buckets FROM aws.s3.buckets
+WHERE region = 'us-east-1'
+GROUP BY year
 """
 
 regions = os.environ.get('AWS_REGIONS').split(',')
 
 async_queries = [
     f"""
-    SELECT '{region}' as region, instanceType, COUNT(*) as num_instances
-    FROM aws.ec2.instances
+    SELECT region, COUNT(*) as num_functions
+    FROM awscc.lambda.functions
     WHERE region = '{region}'
-    GROUP BY instanceType
     """
     for region in regions
 ]