This is an automated email from the ASF dual-hosted git repository. bereng pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/cassandra-dtest.git
The following commit(s) were added to refs/heads/trunk by this push: new 9092c68f Fix dtest-offheap.materialized_views_test.TestMaterializedViews.test_mv_with_default_ttl_with_flush 9092c68f is described below commit 9092c68f0c3d5ee6152471c8bbd499c8e5657378 Author: Bereng <berenguerbl...@gmail.com> AuthorDate: Fri May 6 10:18:18 2022 +0200 Fix dtest-offheap.materialized_views_test.TestMaterializedViews.test_mv_with_default_ttl_with_flush patch by Berenguer Blasi; reviewed by Andres de la Peña for CASSANDRA-17605 --- materialized_views_test.py | 49 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/materialized_views_test.py b/materialized_views_test.py index 8fcecba6..438dbd70 100644 --- a/materialized_views_test.py +++ b/materialized_views_test.py @@ -1399,22 +1399,49 @@ class TestMaterializedViews(Tester): assert_one(session, "SELECT * FROM mv", [1, 3, 1]) # user provided ttl - self.update_view(session, "UPDATE t USING TTL 50 SET a = 4 WHERE k = 1", flush) - assert_one(session, "SELECT * FROM t", [1, 4, 1]) - assert_one(session, "SELECT * FROM mv", [1, 4, 1]) + start = time.time() + self.update_view(session, "UPDATE t USING TTL 100 SET a = 4 WHERE k = 1", flush) + try: + assert_one(session, "SELECT * FROM t", [1, 4, 1]) + assert_one(session, "SELECT * FROM mv", [1, 4, 1]) + except AssertionError as ae: + if (time.time() - start) >= 100: + pytest.fail("Please increase the 100 TTL which expired before we could test due to a slow env.") + else: + raise ae - self.update_view(session, "UPDATE t USING TTL 40 SET a = 5 WHERE k = 1", flush) - assert_one(session, "SELECT * FROM t", [1, 5, 1]) - assert_one(session, "SELECT * FROM mv", [1, 5, 1]) + start = time.time() + self.update_view(session, "UPDATE t USING TTL 80 SET a = 5 WHERE k = 1", flush) + try: + assert_one(session, "SELECT * FROM t", [1, 5, 1]) + assert_one(session, "SELECT * FROM mv", [1, 5, 1]) + except AssertionError as ae: + if (time.time() - start) >= 80: + pytest.fail("Please increase the 80 TTL which expired before we could test due to a slow env.") + else: + raise ae - self.update_view(session, "UPDATE t USING TTL 30 SET a = 6 WHERE k = 1", flush) - assert_one(session, "SELECT * FROM t", [1, 6, 1]) - assert_one(session, "SELECT * FROM mv", [1, 6, 1]) + start = time.time() + self.update_view(session, "UPDATE t USING TTL 60 SET a = 6 WHERE k = 1", flush) + try: + assert_one(session, "SELECT * FROM t", [1, 6, 1]) + assert_one(session, "SELECT * FROM mv", [1, 6, 1]) + except AssertionError as ae: + if (time.time() - start) >= 60: + pytest.fail("Please increase the 60 TTL which expired before we could test due to a slow env.") + else: + raise ae if flush: self.cluster.compact() - assert_one(session, "SELECT * FROM t", [1, 6, 1]) - assert_one(session, "SELECT * FROM mv", [1, 6, 1]) + try: + assert_one(session, "SELECT * FROM t", [1, 6, 1]) + assert_one(session, "SELECT * FROM mv", [1, 6, 1]) + except AssertionError as ae: + if (time.time() - start) >= 60: + pytest.fail("Please increase the 60 TTL which expired before we could test due to a slow env.") + else: + raise ae @flaky @since('3.0') --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org