[fix](cloud) Fix some test_manager_interface case run in cloud mode

deardeng · Jul 19, 2024 · 87d1b78 · 87d1b78
1 parent d619683
commit 87d1b78
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/regression-test/suites/manager/test_manager_interface_2.groovy b/regression-test/suites/manager/test_manager_interface_2.groovy
@@ -318,6 +318,9 @@ suite('test_manager_interface_2',"p0") {
         sql """ ALTER TABLE internal.__internal_schema.column_statistics SET ("replication_num" = "1") """
 
     }
+    if (isCloudMode()) {
+        return
+    }
     test_system()
 
 

diff --git a/regression-test/suites/manager/test_manager_interface_3.groovy b/regression-test/suites/manager/test_manager_interface_3.groovy
@@ -84,6 +84,14 @@ suite('test_manager_interface_3',"p0") {
 
         sql """CREATE USER '${user1}' IDENTIFIED BY '${pwd}' default role '${role1}' """
         sql """CREATE USER '${user2}' IDENTIFIED BY '${pwd}'  """
+        //cloud-mode
+        if (isCloudMode()) {
+            def clusters = sql " SHOW CLUSTERS; "
+            assertTrue(!clusters.isEmpty())
+            def validCluster = clusters[0][0]
+            sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user1}""";
+            sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user2}""";
+        }
 
         connect(user=user1, password="${pwd}", url=url) {
             test {
@@ -399,6 +407,13 @@ suite('test_manager_interface_3',"p0") {
         sql """grant  USAGE_PRIV on RESOURCE  ${resource_name} TO ROLE '${role}' """
 
         sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}' default role '${role}' """
+        //cloud-mode
+        if (isCloudMode()) {
+            def clusters = sql " SHOW CLUSTERS; "
+            assertTrue(!clusters.isEmpty())
+            def validCluster = clusters[0][0]
+            sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        }
 
         List<List<Object>> result = sql  """ show resources """
 
@@ -589,6 +604,13 @@ suite('test_manager_interface_3',"p0") {
         sql """drop user if exists ${user}"""
 
         sql """CREATE USER '${user}' IDENTIFIED BY '${pwd}'"""
+        //cloud-mode
+        if (isCloudMode()) {
+            def clusters = sql " SHOW CLUSTERS; "
+            assertTrue(!clusters.isEmpty())
+            def validCluster = clusters[0][0]
+            sql """GRANT USAGE_PRIV ON CLUSTER ${validCluster} TO ${user}""";
+        }
 
         connect(user=user, password="${pwd}", url=url) { 
             List<List<Object>> result = sql """ show property like  "max_query_instances" """