Fix mocking

Author: aversey

Diff for: python/tests/constructor/test_query.py

@@ -14,6 +14,7 @@
 #   limitations under the License.
 #
 import warnings
+from unittest import mock
 
 import pytest
 from hsfs import feature, feature_group
@@ -22,53 +23,55 @@
 
 
 class TestQuery:
-    fg1 = feature_group.FeatureGroup(
-        name="test1",
-        version=1,
-        featurestore_id=99,
-        primary_key=[],
-        partition_key=[],
-        features=[
-            feature.Feature("id", feature_group_id=11),
-            feature.Feature("label", feature_group_id=11),
-            feature.Feature("tf_name", feature_group_id=11),
-        ],
-        id=11,
-        stream=False,
-    )
-
-    fg2 = feature_group.FeatureGroup(
-        name="test2",
-        version=1,
-        featurestore_id=99,
-        primary_key=[],
-        partition_key=[],
-        features=[
-            feature.Feature("id", feature_group_id=12),
-            feature.Feature("tf1_name", feature_group_id=12),
-        ],
-        id=12,
-        stream=False,
-    )
-
-    fg3 = feature_group.FeatureGroup(
-        name="test3",
-        version=1,
-        featurestore_id=99,
-        primary_key=[],
-        partition_key=[],
-        features=[
-            feature.Feature("id", feature_group_id=13),
-            feature.Feature("tf_name", feature_group_id=13),
-            feature.Feature("tf1_name", feature_group_id=13),
-            feature.Feature("tf3_name", feature_group_id=13),
-        ],
-        id=13,
-        stream=False,
-    )
+    with mock.patch("hopsworks_common.client.get_instance"):
+        fg1 = feature_group.FeatureGroup(
+            name="test1",
+            version=1,
+            featurestore_id=99,
+            primary_key=[],
+            partition_key=[],
+            features=[
+                feature.Feature("id", feature_group_id=11),
+                feature.Feature("label", feature_group_id=11),
+                feature.Feature("tf_name", feature_group_id=11),
+            ],
+            id=11,
+            stream=False,
+        )
+
+        fg2 = feature_group.FeatureGroup(
+            name="test2",
+            version=1,
+            featurestore_id=99,
+            primary_key=[],
+            partition_key=[],
+            features=[
+                feature.Feature("id", feature_group_id=12),
+                feature.Feature("tf1_name", feature_group_id=12),
+            ],
+            id=12,
+            stream=False,
+        )
+
+        fg3 = feature_group.FeatureGroup(
+            name="test3",
+            version=1,
+            featurestore_id=99,
+            primary_key=[],
+            partition_key=[],
+            features=[
+                feature.Feature("id", feature_group_id=13),
+                feature.Feature("tf_name", feature_group_id=13),
+                feature.Feature("tf1_name", feature_group_id=13),
+                feature.Feature("tf3_name", feature_group_id=13),
+            ],
+            id=13,
+            stream=False,
+        )
 
     def test_from_response_json_python(self, mocker, backend_fixtures):
         # Arrange
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.engine.get_type", return_value="python")
         json = backend_fixtures["query"]["get"]["response"]
 
@@ -90,6 +93,7 @@ def test_from_response_json_python(self, mocker, backend_fixtures):
 
     def test_from_response_json_external_fg_python(self, mocker, backend_fixtures):
         # Arrange
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.engine.get_type", return_value="python")
         json = backend_fixtures["query"]["get_external_fg"]["response"]
 
@@ -111,6 +115,7 @@ def test_from_response_json_external_fg_python(self, mocker, backend_fixtures):
 
     def test_from_response_json_spark(self, mocker, backend_fixtures):
         # Arrange
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.engine.get_type", return_value="spark")
         json = backend_fixtures["query"]["get"]["response"]
 
@@ -132,6 +137,7 @@ def test_from_response_json_spark(self, mocker, backend_fixtures):
 
     def test_from_response_json_external_fg_spark(self, mocker, backend_fixtures):
         # Arrange
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.engine.get_type", return_value="spark")
         json = backend_fixtures["query"]["get_external_fg"]["response"]
 
@@ -153,6 +159,7 @@ def test_from_response_json_external_fg_spark(self, mocker, backend_fixtures):
 
     def test_from_response_json_basic_info(self, mocker, backend_fixtures):
         # Arrange
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.engine.get_type", return_value="python")
         json = backend_fixtures["query"]["get_basic_info"]["response"]
 
@@ -174,6 +181,7 @@ def test_from_response_json_basic_info(self, mocker, backend_fixtures):
 
     def test_from_response_json_basic_info_deprecated(self, mocker, backend_fixtures):
         # Arrange
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.engine.get_type", return_value="python")
         json = backend_fixtures["query"]["get_basic_info_deprecated"]["response"]
 
@@ -199,6 +207,7 @@ def test_from_response_json_basic_info_deprecated(self, mocker, backend_fixtures
         )
 
     def test_as_of(self, mocker, backend_fixtures):
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.engine.get_type", return_value="python")
         q = query.Query.from_response_json(backend_fixtures["query"]["get"]["response"])
         q.as_of("2022-01-01 00:00:00")

Diff for: python/tests/core/test_feature_view_engine.py

@@ -13,6 +13,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+from unittest import mock
 from unittest.mock import MagicMock
 
 import pytest
@@ -32,50 +33,51 @@
 from hsfs.storage_connector import BigQueryConnector, StorageConnector
 
 
-engine.init("python")
-fg1 = feature_group.FeatureGroup(
-    name="test1",
-    version=1,
-    featurestore_id=99,
-    primary_key=[],
-    partition_key=[],
-    features=[feature.Feature("id"), feature.Feature("label")],
-    id=11,
-    stream=False,
-)
-
-fg2 = feature_group.FeatureGroup(
-    name="test2",
-    version=1,
-    featurestore_id=99,
-    primary_key=[],
-    partition_key=[],
-    features=[feature.Feature("id"), feature.Feature("label")],
-    id=12,
-    stream=False,
-)
-
-fg3 = feature_group.FeatureGroup(
-    name="test2",
-    version=1,
-    featurestore_id=99,
-    primary_key=[],
-    partition_key=[],
-    features=[feature.Feature("id"), feature.Feature("label")],
-    id=13,
-    stream=False,
-)
-
-fg4 = feature_group.FeatureGroup(
-    name="test4",
-    version=1,
-    featurestore_id=99,
-    primary_key=[],
-    partition_key=[],
-    features=[feature.Feature("id4"), feature.Feature("label4")],
-    id=14,
-    stream=False,
-)
+with mock.patch("hopsworks_common.client.get_instance"):
+    engine.init("python")
+    fg1 = feature_group.FeatureGroup(
+        name="test1",
+        version=1,
+        featurestore_id=99,
+        primary_key=[],
+        partition_key=[],
+        features=[feature.Feature("id"), feature.Feature("label")],
+        id=11,
+        stream=False,
+    )
+
+    fg2 = feature_group.FeatureGroup(
+        name="test2",
+        version=1,
+        featurestore_id=99,
+        primary_key=[],
+        partition_key=[],
+        features=[feature.Feature("id"), feature.Feature("label")],
+        id=12,
+        stream=False,
+    )
+
+    fg3 = feature_group.FeatureGroup(
+        name="test2",
+        version=1,
+        featurestore_id=99,
+        primary_key=[],
+        partition_key=[],
+        features=[feature.Feature("id"), feature.Feature("label")],
+        id=13,
+        stream=False,
+    )
+
+    fg4 = feature_group.FeatureGroup(
+        name="test4",
+        version=1,
+        featurestore_id=99,
+        primary_key=[],
+        partition_key=[],
+        features=[feature.Feature("id4"), feature.Feature("label4")],
+        id=14,
+        stream=False,
+    )
 
 query = fg1.select_all()
 

Diff for: python/tests/core/test_statistics_engine.py

@@ -15,6 +15,7 @@
 #
 
 import json
+from unittest import mock
 
 import pytest
 from hsfs import (
@@ -30,15 +31,16 @@
 
 
 engine._engine_type = "python"
-fg = feature_group.FeatureGroup(
-    name="test",
-    version=1,
-    featurestore_id=99,
-    primary_key=[],
-    partition_key=[],
-    id=10,
-    stream=False,
-)
+with mock.patch("hopsworks_common.client.get_instance"):
+    fg = feature_group.FeatureGroup(
+        name="test",
+        version=1,
+        featurestore_id=99,
+        primary_key=[],
+        partition_key=[],
+        id=10,
+        stream=False,
+    )
 query = fg.select_all()
 
 
@@ -47,7 +49,7 @@ def test_compute_and_save_statistics(self, mocker):
         # Arrange
         feature_store_id = 99
 
-        mocker.patch("hsfs.client.get_instance")
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.engine.get_type", return_value="python")
         mocker.patch("hsfs.util.get_hudi_datestr_from_timestamp")
         mock_statistics_engine_profile_statistics = mocker.patch(
@@ -90,7 +92,7 @@ def test_compute_and_save_statistics_get_type_spark(self, mocker):
         # Arrange
         feature_store_id = 99
 
-        mocker.patch("hsfs.client.get_instance")
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.engine.get_type", return_value="spark")
         mocker.patch("hsfs.util.get_hudi_datestr_from_timestamp")
         mock_statistics_engine_profile_statistics = mocker.patch(
@@ -133,6 +135,7 @@ def test_compute_and_save_statistics_feature_view_obj(self, mocker):
         # Arrange
         feature_store_id = 99
 
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.client.get_instance")
         mocker.patch("hsfs.engine.get_type")
         mocker.patch("hsfs.util.get_hudi_datestr_from_timestamp")
@@ -191,7 +194,7 @@ def test_compute_and_save_statistics_get_type_spark_content_str(
             ]["response"]
         )
 
-        mocker.patch("hsfs.client.get_instance")
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.engine.get_type", return_value="spark")
         mocker.patch("hsfs.util.get_hudi_datestr_from_timestamp")
         mock_statistics_engine_profile_statistics = mocker.patch(
@@ -241,6 +244,7 @@ def test_compute_and_save_statistics_feature_view_obj_content_str(
             ]["response"]
         )
 
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.client.get_instance")
         mocker.patch("hsfs.engine.get_type")
         mocker.patch("hsfs.util.get_hudi_datestr_from_timestamp")
@@ -294,7 +298,7 @@ def test_compute_and_save_statistics_get_type_spark_feature_group_commit_id(
         # Arrange
         feature_store_id = 99
 
-        mocker.patch("hsfs.client.get_instance")
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.engine.get_type", return_value="spark")
         mocker.patch("hsfs.util.get_hudi_datestr_from_timestamp")
         mock_statistics_engine_profile_statistics = mocker.patch(
@@ -339,6 +343,7 @@ def test_compute_and_save_statistics_feature_view_obj_feature_group_commit_id(
         # Arrange
         feature_store_id = 99
 
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.client.get_instance")
         mocker.patch("hsfs.engine.get_type")
         mocker.patch("hsfs.util.get_hudi_datestr_from_timestamp")
@@ -390,6 +395,7 @@ def test_profile_statistics_with_config(self, mocker):
         # Arrange
         feature_store_id = 99
 
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.engine.get_type")
         mock_engine_get_instance = mocker.patch("hsfs.engine.get_instance")
         mock_warning = mocker.patch("warnings.warn")
@@ -435,6 +441,7 @@ def test_profile_statistics_with_config_head(self, mocker):
         # Arrange
         feature_store_id = 99
 
+        mocker.patch("hopsworks_common.client.get_instance")
         mocker.patch("hsfs.engine.get_type")
         mock_engine_get_instance = mocker.patch("hsfs.engine.get_instance")