Merge pull request #104 from ifesdjeen/CASSANDRA-16217-followup

Follow-up: remove tests deprecated by CASSANDRA-16217
diff --git a/auth_test.py b/auth_test.py
index 1061b17..6d92ff5 100644
--- a/auth_test.py
+++ b/auth_test.py
@@ -216,7 +216,7 @@
 
         self.fixture_dtest_setup.ignore_log_patterns = list(self.fixture_dtest_setup.ignore_log_patterns) + [
             r'Invalid metadata has been detected for role bob']
-        assert_exception(session, "LIST USERS", "Invalid metadata has been detected for role", expected=(ServerError))
+        assert_exception(session, "LIST USERS", "Invalid metadata has been detected for role", expected=(NoHostAvailable))
         try:
             self.get_session(user='bob', password='12345')
         except NoHostAvailable as e:
diff --git a/bootstrap_test.py b/bootstrap_test.py
index 51ee32e..3db8eab 100644
--- a/bootstrap_test.py
+++ b/bootstrap_test.py
@@ -827,8 +827,8 @@
 
     def _monitor_datadir(self, node, event, basecount, jobs, failed):
         while True:
+            sstables = [s for s in node.get_sstables("keyspace1", "standard1") if "tmplink" not in s]
             if len(sstables) > basecount + jobs:
-                sstables = [s for s in node.get_sstables("keyspace1", "standard1") if "tmplink" not in s]
                 logger.error("---")
                 for sstable in sstables:
                     logger.error(sstable)