Fix some minor test failures: virtual tables, replaced time.sleep by wait_until..

Author: aboudreault

build.yaml

@@ -162,7 +162,7 @@ cassandra:
   - 'dse-5.1'
   - 'dse-6.0'
   - 'dse-6.7'
-  - 'dse-6.8'
+  - 'dse-6.8.0'
 
 env:
   CYTHON:

cassandra/metadata.py

@@ -1407,7 +1407,6 @@ def _make_option_strings(cls, options_map):
         return list(sorted(ret))
 
 
-# TODO This should inherit V4 later?
 class TableMetadataDSE68(TableMetadataV3):
 
     vertex = None
@@ -2932,7 +2931,7 @@ def _query_all(self):
             QueryMessage(query=self._SELECT_VIRTUAL_KEYSPACES, consistency_level=cl),
             QueryMessage(query=self._SELECT_VIRTUAL_TABLES, consistency_level=cl),
             QueryMessage(query=self._SELECT_VIRTUAL_COLUMNS, consistency_level=cl),
-            # dse7.0 only
+            # dse6.8 only
             QueryMessage(query=self._SELECT_VERTICES, consistency_level=cl),
             QueryMessage(query=self._SELECT_EDGES, consistency_level=cl)
         ]
@@ -2969,12 +2968,21 @@ def _query_all(self):
         self.indexes_result = self._handle_results(indexes_success, indexes_result)
         self.views_result = self._handle_results(views_success, views_result)
 
-        self.virtual_keyspaces_result = self._handle_results(virtual_ks_success,
-                                                             virtual_ks_result)
-        self.virtual_tables_result = self._handle_results(virtual_table_success,
-                                                          virtual_table_result)
-        self.virtual_columns_result = self._handle_results(virtual_column_success,
-                                                           virtual_column_result)
+        # These tables don't exist in some DSE versions reporting 4.X so we can
+        # ignore them if we got an error
+        self.virtual_keyspaces_result = self._handle_results(
+            virtual_ks_success, virtual_ks_result,
+            expected_failures=(InvalidRequest,)
+        )
+        self.virtual_tables_result = self._handle_results(
+            virtual_table_success, virtual_table_result,
+            expected_failures=(InvalidRequest,)
+        )
+        self.virtual_columns_result = self._handle_results(
+            virtual_column_success, virtual_column_result,
+            expected_failures=(InvalidRequest,)
+        )
+
         # dse6.8-only results
         self.vertices_result = self._handle_results(vertices_success, vertices_result)
         self.edges_result = self._handle_results(edges_success, edges_result)

tests/integration/advanced/graph/fluent/test_graph.py

@@ -31,6 +31,7 @@
 from gremlin_python.structure.graph import Edge as TravEdge
 from gremlin_python.structure.graph import Vertex as TravVertex, VertexProperty as TravVertexProperty
 
+from tests.util import wait_until_not_raised
 from tests.integration import DSE_VERSION, greaterthanorequaldse68
 from tests.integration.advanced.graph import GraphUnitTestCase, \
     ClassicGraphSchema, CoreGraphSchema, \
@@ -509,8 +510,10 @@ def __test_udt(self, schema, graphson, address_class, address_with_tags_class,
                     property('owners', frozen(listOf(tupleOf(Text, Int)))).create();
                 """, execution_profile=ep)
 
-        time.sleep(2)  # wait the UDT to be discovered
-        self.session.cluster.register_user_type(self.graph_name, 'address', Address)
+        # wait max 10 seconds to get the UDT discovered.
+        wait_until_not_raised(
+            lambda: self.session.cluster.register_user_type(self.graph_name, 'address', Address),
+            1, 10)
         self.session.cluster.register_user_type(self.graph_name, 'addressTags', AddressWithTags)
         self.session.cluster.register_user_type(self.graph_name, 'complexAddress', ComplexAddress)
         self.session.cluster.register_user_type(self.graph_name, 'complexAddressWithOwners', ComplexAddressWithOwners)

tests/integration/advanced/graph/test_graph_query.py

@@ -161,6 +161,8 @@ def test_profile_graph_options(self):
             s.execute_graph(statement, execution_profile=ep)
         except NoHostAvailable:
             self.assertTrue(DSE_VERSION >= Version("6.0"))
+        except InvalidRequest:
+            self.assertTrue(DSE_VERSION >= Version("5.1"))
         else:
             if DSE_VERSION < Version("6.8"):  # >6.8 returns true
                 self.fail("Should have risen ServerError or InvalidRequest")

tests/integration/simulacron/utils.py

@@ -358,7 +358,9 @@ def prime_driver_defaults():
     # prepare empty rows for NGDG
     for query in [SchemaParserDSE68._SELECT_VERTICES,
                   SchemaParserDSE68._SELECT_EDGES]:
-        PrimeQuery(query, result='success', then={'rows': [], 'column_types': {'row1': 'int'}})
+        client_simulacron.submit_request(
+            PrimeQuery(query, result='success',
+            then={'rows': [], 'column_types': {'row1': 'int'}}))
 
 
 def prime_cluster(data_centers="3", version=None, cluster_name=DEFAULT_CLUSTER, dse_version=None):