local test fixed

wednesday-solutions · Feb 19, 2024 · a333cda · a333cda
1 parent 41ab34e
commit a333cda
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/jobs/demo.py b/jobs/demo.py
@@ -2,8 +2,8 @@
 from dotenv import load_dotenv
 import app.environment as env
 
-load_dotenv("../app/.custom_env") # Loading env for databricks
-load_dotenv() # Loading env for glue
+load_dotenv("../app/.custom_env")  # Loading env for databricks
+load_dotenv()  # Loading env for glue
 
 # COMMAND ----------
 

diff --git a/jobs/main.py b/jobs/main.py
@@ -9,8 +9,8 @@
 import app.environment as env
 import app.spark_wrapper as sw
 
-load_dotenv("../app/.custom_env") # Loading env for databricks
-load_dotenv() # Loading env for glue
+load_dotenv("../app/.custom_env")  # Loading env for databricks
+load_dotenv()  # Loading env for glue
 
 # COMMAND ----------
 

diff --git a/tests/test_spark_wrapper_failure.py b/tests/test_spark_wrapper_failure.py
@@ -29,10 +29,14 @@ def test_value_counts_invalid_column(self):
         with self.assertRaises(U.AnalysisException) as context:
             value_counts(self.df, "nonexistent_column")
 
-        expected_error_message = re.compile("Column '.+' does not exist")
+        expected_error_message_1 = re.compile("Column '.+' does not exist")
+        expected_error_message_2 = re.compile("cannot resolve '.+' given input columns")
         actual_error_message = str(context.exception)
 
-        self.assertTrue(expected_error_message.search(actual_error_message))
+        self.assertTrue(
+            expected_error_message_1.search(actual_error_message)
+            or expected_error_message_2.search(actual_error_message)
+        )
 
     def test_create_frame_invalid_path(self):
         with self.assertRaises(U.AnalysisException) as context:
@@ -48,19 +52,30 @@ def test_make_window_invalid_window_spec(self):
             window_spec = make_window("invalid_column", "date", -20, -1)
             self.df.withColumn("literal_1", F.lit(1).over(window_spec))
 
-        expected_error_message = re.compile("Column '.+' does not exist")
+        expected_error_message_1 = re.compile("Column '.+' does not exist")
+        expected_error_message_2 = re.compile("cannot resolve '.+' given input columns")
         actual_error_message = str(context.exception)
 
-        self.assertTrue(expected_error_message.search(actual_error_message))
+        self.assertTrue(
+            expected_error_message_1.search(actual_error_message)
+            or expected_error_message_2.search(actual_error_message)
+        )
 
     def test_make_window_invalid_range(self):
         with self.assertRaises(U.AnalysisException) as context:
             window_spec = make_window("market", "date", 5, 2)
             self.df.withColumn("literal_1", F.lit(1).over(window_spec))
 
-        expected_error_message = "The lower bound of a window frame must be less than or equal to the upper bound"
+        expected_error_message_1 = "The lower bound of a window frame must be less than or equal to the upper bound"
+        expected_error_message_2 = re.compile(
+            "The data type of the lower bound '.+' does not match the expected data type '.+'"
+        )
         actual_error_message = str(context.exception)
-        self.assertTrue(expected_error_message in actual_error_message)
+
+        self.assertTrue(
+            expected_error_message_1 in actual_error_message
+            or expected_error_message_2.search(actual_error_message)
+        )
 
     def test_rename_column_invalid_column(self):
         with self.assertRaises(ValueError) as context: