Fix test_base_client.py

It was impure, changing environ variable and thereby messing other tests. This commit wraps these tests in a decorator saving and restoring os.environ.

locust_benchmark/create_feature_group.py

@@ -1,7 +1,6 @@
 from common.hopsworks_client import HopsworksClient
 
 if __name__ == "__main__":
-
     hopsworks_client = HopsworksClient()
     fg = hopsworks_client.get_or_create_fg()
     hopsworks_client.insert_data(fg)

python/tests/client/test_base_client.py

@@ -15,14 +15,29 @@
 #
 
 import os
+from functools import wraps
 
 import pytest
 import requests
 from hsfs.client.base import Client
 from hsfs.client.exceptions import RestAPIError
 
 
+def changes_environ(f):
+    @wraps(f)
+    def g(*args, **kwds):
+        old_environ = os.environ.copy()
+        try:
+            return f(*args, **kwds)
+        finally:
+            os.environ.clear()
+            os.environ.update(old_environ)
+
+    return g
+
+
 class TestBaseClient:
+    @changes_environ
     def test_valid_token_no_retires(self, mocker):
         # Arrange
         os.environ[Client.REST_ENDPOINT] = "True"
@@ -48,6 +63,7 @@ def test_valid_token_no_retires(self, mocker):
         # Assert
         assert spy_retry_token_expired.call_count == 0
 
+    @changes_environ
     def test_invalid_token_retires(self, mocker):
         # Arrange
         os.environ[Client.REST_ENDPOINT] = "True"
@@ -77,6 +93,7 @@ def test_invalid_token_retires(self, mocker):
         # Assert
         assert spy_retry_token_expired.call_count == 10
 
+    @changes_environ
     def test_invalid_token_retires_backoff_break(self, mocker):
         # Arrange
         os.environ[Client.REST_ENDPOINT] = "True"