Revert "Reapply "adhoc""

This reverts commit 6837eeb.

bzfs_tests/test_integrations.py

@@ -92,7 +92,7 @@
 
 
 def suite():
-    test_mode = getenv_any("test_mode", "adhoc")  # Consider toggling this when testing isolated code changes
+    test_mode = getenv_any("test_mode", "")  # Consider toggling this when testing isolated code changes
     is_adhoc_test = test_mode == "adhoc"  # run only a few isolated changes
     is_functional_test = test_mode == "functional"  # run most tests but only in a single local config combination
     suite = unittest.TestSuite()
@@ -587,14 +587,14 @@ class AdhocTestCase(BZFSTestCase):
     """For testing isolated changes you are currently working on. You can temporarily change the list of tests here.
     The current list is arbitrary and subject to change at any time."""
 
-    def test_basic_replication_flat_simple_with_progress_reporter(self):
-        LocalTestCase(param=self.param).test_basic_replication_flat_simple_with_progress_reporter()
+    def test_zfs_recv_include_regex_with_duplicate_o_and_x_names(self):
+        LocalTestCase(param=self.param).test_zfs_recv_include_regex_with_duplicate_o_and_x_names()
 
-    # def test_basic_replication_flat_simple(self):
-    #     FullRemoteTestCase(param=self.param).test_basic_replication_flat_simple()
-    #
-    # def test_zfs_set_via_recv_o(self):
-    #     FullRemoteTestCase(param=self.param).test_zfs_set_via_recv_o()
+    def test_basic_replication_flat_simple(self):
+        FullRemoteTestCase(param=self.param).test_basic_replication_flat_simple()
+
+    def test_zfs_set_via_recv_o(self):
+        FullRemoteTestCase(param=self.param).test_zfs_set_via_recv_o()
 
 
 #############################################################################