fix maintenance.feature tests

yandex · May 6, 2024 · 9285a7e · 9285a7e
1 parent 5b0ff26
commit 9285a7e
Showing 1 changed file with 66 additions and 30 deletions.
diff --git a/tests/features/maintenance.feature b/tests/features/maintenance.feature
@@ -64,25 +64,37 @@ Feature: maintenance mode
       """
     When I run SQL on mysql host "mysql2"
       """
-      show global variables like 'rpl_semi_sync_%_enabled'
+      SHOW GLOBAL VARIABLES LIKE 'rpl_semi_sync_%_enabled'
       """
     Then SQL result should match json
       """
-      [{
-          "MasterEnabled":"0",
-          "SlaveEnabled":"1"
-      }]
+      [
+        {
+          "Value":"OFF",
+          "Variable_name":"rpl_semi_sync_master_enabled"
+        },
+        {
+          "Value":"ON",
+          "Variable_name":"rpl_semi_sync_slave_enabled"
+        }
+      ]
       """
     When I run SQL on mysql host "mysql1"
       """
-      show global variables like 'rpl_semi_sync_%_enabled'
+      SHOW GLOBAL VARIABLES LIKE 'rpl_semi_sync_%_enabled'
       """
     Then SQL result should match json
       """
-      [{
-          "MasterEnabled":"1",
-          "SlaveEnabled":"0"
-      }]
+      [
+        {
+          "Value":"ON",
+          "Variable_name":"rpl_semi_sync_master_enabled"
+        },
+        {
+          "Value":"OFF",
+          "Variable_name":"rpl_semi_sync_slave_enabled"
+        }
+      ]
       """
     When I run command on host "mysql1"
       """
@@ -103,25 +115,37 @@ Feature: maintenance mode
     And zookeeper node "/test/active_nodes" should not exist
     When I run SQL on mysql host "mysql2"
       """
-      SELECT @@rpl_semi_sync_master_enabled AS MasterEnabled, @@rpl_semi_sync_slave_enabled AS SlaveEnabled;
+      SHOW GLOBAL VARIABLES LIKE 'rpl_semi_sync_%_enabled'
       """
     Then SQL result should match json
       """
-      [{
-          "MasterEnabled":"0",
-          "SlaveEnabled":"1"
-      }]
+      [
+        {
+          "Value":"OFF",
+          "Variable_name":"rpl_semi_sync_master_enabled"
+        },
+        {
+          "Value":"ON",
+          "Variable_name":"rpl_semi_sync_slave_enabled"
+        }
+      ]
       """
     When I run SQL on mysql host "mysql1"
       """
-      SELECT @@rpl_semi_sync_master_enabled AS MasterEnabled, @@rpl_semi_sync_slave_enabled AS SlaveEnabled;
+      SHOW GLOBAL VARIABLES LIKE 'rpl_semi_sync_%_enabled'
       """
     Then SQL result should match json
       """
-      [{
-          "MasterEnabled":"0",
-          "SlaveEnabled":"0"
-      }]
+      [
+        {
+          "Value":"OFF",
+          "Variable_name":"rpl_semi_sync_master_enabled"
+        },
+        {
+          "Value":"OFF",
+          "Variable_name":"rpl_semi_sync_slave_enabled"
+        }
+      ]
       """
     When I run command on host "mysql1"
       """
@@ -135,25 +159,37 @@ Feature: maintenance mode
       """
     When I run SQL on mysql host "mysql2"
       """
-      SELECT @@rpl_semi_sync_master_enabled AS MasterEnabled, @@rpl_semi_sync_slave_enabled AS SlaveEnabled;
+      SHOW GLOBAL VARIABLES LIKE 'rpl_semi_sync_%_enabled'
       """
     Then SQL result should match json
       """
-      [{
-          "MasterEnabled":"0",
-          "SlaveEnabled":"1"
-      }]
+      [
+        {
+          "Value":"OFF",
+          "Variable_name":"rpl_semi_sync_master_enabled"
+        },
+        {
+          "Value":"ON",
+          "Variable_name":"rpl_semi_sync_slave_enabled"
+        }
+      ]
       """
     When I run SQL on mysql host "mysql1"
       """
-      SELECT @@rpl_semi_sync_master_enabled AS MasterEnabled, @@rpl_semi_sync_slave_enabled AS SlaveEnabled;
+      SHOW GLOBAL VARIABLES LIKE 'rpl_semi_sync_%_enabled'
       """
     Then SQL result should match json
       """
-      [{
-          "MasterEnabled":"1",
-          "SlaveEnabled":"0"
-      }]
+      [
+        {
+          "Value":"ON",
+          "Variable_name":"rpl_semi_sync_master_enabled"
+        },
+        {
+          "Value":"OFF",
+          "Variable_name":"rpl_semi_sync_slave_enabled"
+        }
+      ]
       """
 
   Scenario: master host in DCS updated correctly after manual master change