Merge branch 'master' into FSTORE-1463

Author: vatj

python/tests/client/test_base_client.py

@@ -20,9 +20,11 @@
 import requests
 from hsfs.client.base import Client
 from hsfs.client.exceptions import RestAPIError
+from tests.util import changes_environ
 
 
 class TestBaseClient:
+    @changes_environ
     def test_valid_token_no_retires(self, mocker):
         # Arrange
         os.environ[Client.REST_ENDPOINT] = "True"
@@ -48,6 +50,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 +80,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"

python/tests/util.py

@@ -0,0 +1,31 @@
+#
+#   Copyright 2024 Hopsworks AB
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
+
+import os
+from functools import wraps
+
+
+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