cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject [26/50] cassandra git commit: Expand 9673 tests to also run on 3.x
Date Tue, 05 Sep 2017 06:05:40 GMT
Expand 9673 tests to also run on 3.x


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d2d9e6d4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d2d9e6d4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d2d9e6d4

Branch: refs/heads/master
Commit: d2d9e6d4ef638233b8dc403c25c2265cc40df9be
Parents: 50e1e7b
Author: Philip Thompson <ptnapoleon@gmail.com>
Authored: Tue Jul 4 15:27:28 2017 +0200
Committer: Philip Thompson <ptnapoleon@gmail.com>
Committed: Wed Jul 5 11:51:36 2017 +0200

----------------------------------------------------------------------
 batch_test.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d2d9e6d4/batch_test.py
----------------------------------------------------------------------
diff --git a/batch_test.py b/batch_test.py
index 6dcf786..e67d185 100644
--- a/batch_test.py
+++ b/batch_test.py
@@ -285,51 +285,51 @@ class TestBatch(Tester):
         assert_one(session, "SELECT * FROM users", [0, 'Jack', 'Sparrow'])
         assert_one(session, "SELECT * FROM dogs", [0, 'Pluto'])
 
-    @since('3.0', max_version='3.0.x')
+    @since('3.0', max_version='3.x')
     def logged_batch_compatibility_1_test(self):
         """
         @jira_ticket CASSANDRA-9673, test that logged batches still work with a mixed version
cluster.
 
-        Here we have one 3.0 node and two 2.2 nodes and we send the batch request to the
3.0 node.
+        Here we have one 3.0/3.x node and two 2.2 nodes and we send the batch request to
the 3.0 node.
         """
         self._logged_batch_compatibility_test(0, 1, 'github:apache/cassandra-2.2', 2, 4)
 
-    @since('3.0', max_version='3.0.x')
+    @since('3.0', max_version='3.x')
     @skipIf(sys.platform == 'win32', 'Windows production support only on 2.2+')
     def logged_batch_compatibility_2_test(self):
         """
         @jira_ticket CASSANDRA-9673, test that logged batches still work with a mixed version
cluster.
 
-        Here we have one 3.0 node and two 2.1 nodes and we send the batch request to the
3.0 node.
+        Here we have one 3.0/3.x node and two 2.1 nodes and we send the batch request to
the 3.0 node.
         """
         self._logged_batch_compatibility_test(0, 1, 'github:apache/cassandra-2.1', 2, 3)
 
-    @since('3.0', max_version='3.0.x')
+    @since('3.0', max_version='3.x')
     @skipIf(sys.platform == 'win32', 'Windows production support only on 2.2+')
     def logged_batch_compatibility_3_test(self):
         """
         @jira_ticket CASSANDRA-9673, test that logged batches still work with a mixed version
cluster.
 
-        Here we have two 3.0 nodes and one 2.1 node and we send the batch request to the
3.0 node.
+        Here we have two 3.0/3.x nodes and one 2.1 node and we send the batch request to
the 3.0 node.
         """
         self._logged_batch_compatibility_test(0, 2, 'github:apache/cassandra-2.1', 1, 3)
 
-    @since('3.0', max_version='3.0.x')
+    @since('3.0', max_version='3.x')
     def logged_batch_compatibility_4_test(self):
         """
         @jira_ticket CASSANDRA-9673, test that logged batches still work with a mixed version
cluster.
 
-        Here we have two 3.0 nodes and one 2.2 node and we send the batch request to the
2.2 node.
+        Here we have two 3.0/3.x nodes and one 2.2 node and we send the batch request to
the 2.2 node.
         """
         self._logged_batch_compatibility_test(2, 2, 'github:apache/cassandra-2.2', 1, 4)
 
-    @since('3.0', max_version='3.0.x')
+    @since('3.0', max_version='3.x')
     @skipIf(sys.platform == 'win32', 'Windows production support only on 2.2+')
     def logged_batch_compatibility_5_test(self):
         """
         @jira_ticket CASSANDRA-9673, test that logged batches still work with a mixed version
cluster.
 
-        Here we have two 3.0 nodes and one 2.1 node and we send the batch request to the
2.1 node.
+        Here we have two 3.0/3.x nodes and one 2.1 node and we send the batch request to
the 2.1 node.
         """
         self._logged_batch_compatibility_test(2, 2, 'github:apache/cassandra-2.1', 1, 3)
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org


Mime
View raw message