Simplify parameterization to plain python

Author: mkleen

setup.py

@@ -34,8 +34,7 @@ def read(filename):
         'Cython',
         'asyncpg>=0.18.2, < 0.20',
         'pyodbc',
-        'psycopg2-binary>=2.7.5',
-        'parameterized'
+        'psycopg2-binary>=2.7.5'
     ],
     python_requires='>=3.6',
     classifiers=[

tests/bwc/test_recovery.py

@@ -2,15 +2,14 @@
 import unittest
 
 from cr8.run_crate import get_crate, _extract_version
-from parameterized import parameterized
 from crate.client import connect
 import random
 from random import sample
 
 from crate.qa.tests import NodeProvider, insert_data, UpgradePath
 
-UPGRADE_PATHS = [(UpgradePath('4.2.x', '4.3.x'),), (UpgradePath('4.3.x', 'latest-nightly'),)]
-UPGRADE_PATHS_FROM_43 = [(UpgradePath('4.3.x', 'latest-nightly'),)]
+UPGRADE_PATHS = [UpgradePath('4.2.x', '4.3.x'), UpgradePath('4.3.x', 'latest-nightly')]
+UPGRADE_PATHS_FROM_43 = [UpgradePath('4.3.x', 'latest-nightly')]
 
 
 class RecoveryTest(NodeProvider, unittest.TestCase):
@@ -83,12 +82,23 @@ def _upgrade_cluster(self, cluster, version: str, nodes: int) -> None:
             new_node = self.upgrade_node(node, version)
             cluster[i] = new_node
 
-    @parameterized.expand(UPGRADE_PATHS)
-    def test_recovery_with_concurrent_indexing(self, path):
+    def _run_upgrade_paths(self, test, paths):
+        for p in paths:
+            try:
+                self.setUp()
+                test(p)
+            finally:
+                self.tearDown()
+
+    def test_recovery_with_concurrent_indexing(self):
         """
         This test creates a new table and insert data at every stage of the
         rolling upgrade.
         """
+
+        self._run_upgrade_paths(self._test_recovery_with_concurrent_indexing, UPGRADE_PATHS)
+
+    def _test_recovery_with_concurrent_indexing(self, path):
         cluster = self._new_cluster(path.from_version, self.NUMBER_OF_NODES)
         cluster.start()
 
@@ -143,8 +153,10 @@ def test_recovery_with_concurrent_indexing(self, path):
             for node_id in node_ids:
                 self.assert_busy(lambda: self._assert_num_docs_by_node_id(conn, 'doc', 'test', node_id[0], 105))
 
-    @parameterized.expand(UPGRADE_PATHS)
-    def test_relocation_with_concurrent_indexing(self, path):
+    def test_relocation_with_concurrent_indexing(self):
+        self._run_upgrade_paths(self._test_relocation_with_concurrent_indexing, UPGRADE_PATHS)
+
+    def _test_relocation_with_concurrent_indexing(self, path):
         cluster = self._new_cluster(path.from_version, self.NUMBER_OF_NODES)
         cluster.start()
 
@@ -216,13 +228,15 @@ def _assert_shard_state(self, conn, schema, table_name, node_id, state):
         self.assertTrue(current_state)
         self.assertEqual(current_state[0], state)
 
-    @parameterized.expand(UPGRADE_PATHS)
-    def test_recovery(self, path):
+    def test_recovery(self):
         """
         This test creates a new table, insert data and asserts the state at every stage of the
         rolling upgrade.
         """
 
+        self._run_upgrade_paths(self._test_recovery, UPGRADE_PATHS)
+
+    def _test_recovery(self, path):
         cluster = self._new_cluster(path.from_version, self.NUMBER_OF_NODES)
         cluster.start()
 
@@ -253,13 +267,15 @@ def test_recovery(self, path):
 
             self.assert_busy(lambda: self._assert_is_green(conn, 'doc', 'test'))
 
-    @parameterized.expand(UPGRADE_PATHS)
-    def test_recovery_closed_index(self, path):
+    def test_recovery_closed_index(self):
         """
         This test creates a table in the non upgraded cluster and closes it. It then
         checks that the table is effectively closed and potentially replicated.
         """
 
+        self._run_upgrade_paths(self._test_recovery_closed_index, UPGRADE_PATHS)
+
+    def _test_recovery_closed_index(self, path):
         cluster = self._new_cluster(path.from_version, self.NUMBER_OF_NODES)
         cluster.start()
 
@@ -284,8 +300,10 @@ def test_recovery_closed_index(self, path):
 
             self._assert_is_closed(conn, 'doc', 'test')
 
-    @parameterized.expand(UPGRADE_PATHS)
-    def test_closed_index_during_rolling_upgrade(self, path):
+    def test_closed_index_during_rolling_upgrade(self):
+        self._run_upgrade_paths(self._test_closed_index_during_rolling_upgrade, UPGRADE_PATHS)
+
+    def _test_closed_index_during_rolling_upgrade(self, path):
         """
         This test creates and closes a new table at every stage of the rolling
         upgrade. It then checks that the table is effectively closed and
@@ -334,12 +352,15 @@ def test_closed_index_during_rolling_upgrade(self, path):
 
             self._assert_is_closed(conn, 'doc', 'upgraded_cluster')
 
-    @parameterized.expand(UPGRADE_PATHS)
-    def test_update_docs(self, path):
+    def test_update_docs(self):
         """
         This test creates a new table, insert data and updates data at every state at every stage of the
         rolling upgrade.
         """
+
+        self._run_upgrade_paths(self._test_update_docs, UPGRADE_PATHS)
+
+    def _test_update_docs(self, path):
         cluster = self._new_cluster(path.from_version, self.NUMBER_OF_NODES)
         cluster.start()
         with connect(cluster.node().http_url, error_trace=True) as conn:
@@ -384,8 +405,7 @@ def test_update_docs(self, path):
             for result in res:
                 self.assertEqual(result['rowcount'], 1)
 
-    @parameterized.expand(UPGRADE_PATHS_FROM_43)
-    def test_operation_based_recovery(self, path):
+    def test_operation_based_recovery(self):
         """
         Tests that we should perform an operation-based recovery if there were
         some but not too many uncommitted documents (i.e., less than 10% of
@@ -394,6 +414,9 @@ def test_operation_based_recovery(self, path):
         based peer recoveries.
         """
 
+        self._run_upgrade_paths(self._test_operation_based_recovery, UPGRADE_PATHS_FROM_43)
+
+    def _test_operation_based_recovery(self, path):
         cluster = self._new_cluster(path.from_version, self.NUMBER_OF_NODES)
         cluster.start()
 
@@ -435,13 +458,15 @@ def test_operation_based_recovery(self, path):
 
             self._assert_ensure_checkpoints_are_synced(conn, 'doc', 'test')
 
-    @parameterized.expand(UPGRADE_PATHS_FROM_43)
-    def test_turnoff_translog_retention_after_upgraded(self, path):
+    def test_turnoff_translog_retention_after_upgraded(self):
         """
         Verifies that once all shard copies on the new version, we should turn
         off the translog retention for indices with soft-deletes.
         """
 
+        self._run_upgrade_paths(self._test_turnoff_translog_retention_after_upgraded, UPGRADE_PATHS_FROM_43)
+
+    def _test_turnoff_translog_retention_after_upgraded(self, path):
         cluster = self._new_cluster(path.from_version, self.NUMBER_OF_NODES)
         cluster.start()