Move hidden Fusion check to workflow

.github/workflows/coverage.yml

@@ -51,6 +51,7 @@ jobs:
           SINGLESTOREDB_PURE_PYTHON: 0
           SINGLESTORE_LICENSE: ${{ secrets.SINGLESTORE_LICENSE }}
           SINGLESTOREDB_MANAGEMENT_TOKEN: ${{ secrets.CLUSTER_API_KEY }}
+          SINGLESTOREDB_FUSION_ENABLE_HIDDEN: "1"
 
       - name: Run MySQL protocol tests (pure Python)
         run: |
@@ -61,6 +62,7 @@ jobs:
           SINGLESTOREDB_PURE_PYTHON: 1
           SINGLESTORE_LICENSE: ${{ secrets.SINGLESTORE_LICENSE }}
           SINGLESTOREDB_MANAGEMENT_TOKEN: ${{ secrets.CLUSTER_API_KEY }}
+          SINGLESTOREDB_FUSION_ENABLE_HIDDEN: "1"
 
       - name: Run HTTP protocol tests
         run: |
@@ -74,6 +76,7 @@ jobs:
           # used to create the database and the generated database name will
           # be applied to the above URL.
           SINGLESTOREDB_INIT_DB_URL: "root:[email protected]:3307"
+          SINGLESTOREDB_FUSION_ENABLE_HIDDEN: "1"
 
       - name: Generate report
         run: |

singlestoredb/tests/test_fusion.py

@@ -33,8 +33,6 @@ def tearDownClass(cls):
     def setUp(self):
         self.enabled = os.environ.get('SINGLESTOREDB_FUSION_ENABLED')
         os.environ['SINGLESTOREDB_FUSION_ENABLED'] = '1'
-        self.hidden_enabled = os.environ.get('SINGLESTOREDB_FUSION_ENABLE_HIDDEN')
-        os.environ['SINGLESTOREDB_FUSION_ENABLE_HIDDEN'] = '1'
         self.conn = s2.connect(database=type(self).dbname, local_infile=True)
         self.cur = self.conn.cursor()
 
@@ -44,11 +42,6 @@ def tearDown(self):
         else:
             del os.environ['SINGLESTOREDB_FUSION_ENABLED']
 
-        if self.hidden_enabled:
-            os.environ['SINGLESTOREDB_FUSION_ENABLE_HIDDEN'] = self.hidden_enabled
-        else:
-            del os.environ['SINGLESTOREDB_FUSION_ENABLE_HIDDEN']
-
         try:
             if self.cur is not None:
                 self.cur.close()
@@ -141,8 +134,6 @@ def tearDownClass(cls):
     def setUp(self):
         self.enabled = os.environ.get('SINGLESTOREDB_FUSION_ENABLED')
         os.environ['SINGLESTOREDB_FUSION_ENABLED'] = '1'
-        self.hidden_enabled = os.environ.get('SINGLESTOREDB_FUSION_ENABLE_HIDDEN')
-        os.environ['SINGLESTOREDB_FUSION_ENABLE_HIDDEN'] = '1'
         self.conn = s2.connect(database=type(self).dbname, local_infile=True)
         self.cur = self.conn.cursor()
 
@@ -152,11 +143,6 @@ def tearDown(self):
         else:
             del os.environ['SINGLESTOREDB_FUSION_ENABLED']
 
-        if self.hidden_enabled:
-            os.environ['SINGLESTOREDB_FUSION_ENABLE_HIDDEN'] = self.hidden_enabled
-        else:
-            del os.environ['SINGLESTOREDB_FUSION_ENABLE_HIDDEN']
-
         try:
             if self.cur is not None:
                 self.cur.close()
@@ -479,6 +465,10 @@ def test_create_drop_workspace_group(self):
                 pass
 
 
+@unittest.skipIf(
+    os.environ.get('SINGLESTOREDB_FUSION_ENABLE_HIDDEN', '0') == '0',
+    'Hidden Fusion commands are not enabled.',
+)
 @pytest.mark.management
 class TestJobsFusion(unittest.TestCase):
 
@@ -526,8 +516,6 @@ def tearDownClass(cls):
     def setUp(self):
         self.enabled = os.environ.get('SINGLESTOREDB_FUSION_ENABLED')
         os.environ['SINGLESTOREDB_FUSION_ENABLED'] = '1'
-        self.hidden_enabled = os.environ.get('SINGLESTOREDB_FUSION_ENABLE_HIDDEN')
-        os.environ['SINGLESTOREDB_FUSION_ENABLE_HIDDEN'] = '1'
         self.conn = s2.connect(database=type(self).dbname, local_infile=True)
         self.cur = self.conn.cursor()
 
@@ -537,11 +525,6 @@ def tearDown(self):
         else:
             del os.environ['SINGLESTOREDB_FUSION_ENABLED']
 
-        if self.hidden_enabled:
-            os.environ['SINGLESTOREDB_FUSION_ENABLE_HIDDEN'] = self.hidden_enabled
-        else:
-            del os.environ['SINGLESTOREDB_FUSION_ENABLE_HIDDEN']
-
         try:
             if self.cur is not None:
                 self.cur.close()