update token propagate test for new token generation flow

run-house · Sep 12, 2024 · 34d1f5b · 34d1f5b
1 parent de2ce3b
commit 34d1f5b
Show file tree

Hide file tree

Showing 3 changed files with 2,095 additions and 10 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -77,7 +77,7 @@ class TestLevels(str, enum.Enum):
     MAXIMAL = "maximal"
 
 
-DEFAULT_LEVEL = TestLevels.UNIT
+DEFAULT_LEVEL = TestLevels.LOCAL
 
 TEST_LEVEL_HIERARCHY = {
     TestLevels.UNIT: 0,

diff --git a/tests/test_resources/test_clusters/test_cluster.py b/tests/test_resources/test_clusters/test_cluster.py
@@ -417,28 +417,29 @@ def test_changing_name_and_saving_in_between(self, cluster):
 
     @pytest.mark.level("local")
     @pytest.mark.clustertest
-    def test_caller_token_propagated(self, cluster):
+    def test_caller_token_propagated(self, docker_cluster_pk_ssh_no_auth):
+        cluster = docker_cluster_pk_ssh_no_auth
         remote_assume_caller_and_get_token = rh.function(
             assume_caller_and_get_token
         ).to(cluster)
 
         remote_assume_caller_and_get_token.share(
             users=["info@run.house"], notify_users=False
         )
-        current_username = rh.configs.username
-        current_den_token = rh.configs.token
-
         with friend_account():
             unassumed_token, assumed_token = remote_assume_caller_and_get_token()
             # "Local token" is the token the cluster accesses in rh.configs.token; this is what will be used
             # in subsequent rns_client calls
-            assert assumed_token == rh.globals.rns_client.cluster_token(
-                cluster.rns_address,
-                username=current_username,
-                den_token=current_den_token,
-            )
             assert unassumed_token != rh.configs.token
 
+            # Both tokens should be valid for the cluster
+            assert rh.globals.rns_client.validate_cluster_token(
+                assumed_token, cluster.rns_address
+            )
+            assert rh.globals.rns_client.validate_cluster_token(
+                unassumed_token, cluster.rns_address
+            )
+
         # Docker clusters are logged out, ondemand clusters are logged in
         output = cluster.run("sed -n 's/.*token: *//p' ~/.rh/config.yaml")
         # No config file