minor cleanup

Author: mkleen

tests/bwc/test_recovery.py

@@ -29,7 +29,7 @@ def test(self):
                 self._test_closed_index_during_rolling_upgrade,
                 self._test_closed_index_noop_recovery,
                 self._test_relocation_with_concurrent_indexing,
-                # self._test_auto_expand_indices_during_rolling_upgrade,
+                # self._test_auto_expand_indices_during_rolling_upgrade
             ]
         )
 
@@ -39,9 +39,9 @@ def test_from_4_3(self):
                 UpgradePath('4.3.x', 'latest-nightly')
             ],
             [
-                # self._test_retention_leases_established_when_promoting_primary,
                 self._test_turnoff_translog_retention_after_upgraded,
                 self._test_operation_based_recovery
+                # self._test_retention_leases_established_when_promoting_primary
             ]
         )
 
@@ -552,15 +552,18 @@ def _test_turnoff_translog_retention_after_upgraded(self, path, nodes):
             time.sleep(3)
             self._assert_is_green(conn, 'doc', 'test')
             c.execute('refresh table doc.test')
+            self._assert_translog_is_empty(conn, 'doc', 'test')
+
+    def _assert_translog_is_empty(self, conn, schema, table_name):
+        c = conn.cursor()
+        c.execute('''select translog_stats['number_of_operations'], translog_stats['uncommitted_operations']
+                    from sys.shards where table_name=? and schema_name=? ''', (table_name, schema))
+        res = c.fetchall()
+        self.assertTrue(res)
+        for r in res:
+            self.assertEqual(r[0], 0)
+            self.assertEqual(r[1], 0)
 
-            # check for the shard on each node that the translog is empty
-            c.execute('''select translog_stats['number_of_operations'], translog_stats['uncommitted_operations']
-                        from sys.shards where table_name='test' ''')
-            res = c.fetchall()
-            self.assertTrue(len(res), 3)
-            for r in res:
-                self.assertEqual(r[0], 0)
-                self.assertEqual(r[1], 0)
 
     def _test_retention_leases_established_when_promoting_primary(self, path, nodes):
         number_of_replicas = random.randint(1, 2)