This is an automated email from the ASF dual-hosted git repository.

samt 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 146f7677 Drop assertion that no view build has been resumed as this 
may happen during a normal startup
146f7677 is described below

commit 146f7677ae99bae2c5eeed34e85cc7d79dbba230
Author: Sam Tunnicliffe <[email protected]>
AuthorDate: Wed Nov 29 13:07:54 2023 +0000

    Drop assertion that no view build has been resumed as this may happen 
during a normal startup
    
    Patch by Sam Tunnicliffe; reviewed by Marcus Eriksson for CASSANDRA-19093
---
 materialized_views_test.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/materialized_views_test.py b/materialized_views_test.py
index 41b2ade8..474a2540 100644
--- a/materialized_views_test.py
+++ b/materialized_views_test.py
@@ -1124,10 +1124,10 @@ class TestMaterializedViews(Tester):
         self.cluster.stop()
 
         logger.debug("Checking logs to verify that the view build tasks have 
been created")
+        marks = {}
         for node in self.cluster.nodelist():
             assert node.grep_log('Starting new view build', 
filename='debug.log')
-            assert not node.grep_log('Resuming view build', 
filename='debug.log')
-            node.mark_log(filename='debug.log')
+            marks[node] = node.mark_log(filename='debug.log')
 
         logger.debug("Restart the cluster")
         self.cluster.start()
@@ -1152,7 +1152,7 @@ class TestMaterializedViews(Tester):
 
         logger.debug("Checking logs to verify that some view build tasks have 
been resumed")
         for node in self.cluster.nodelist():
-            assert node.grep_log('Resuming view build', filename='debug.log')
+            assert node.grep_log('Resuming view build', filename='debug.log', 
from_mark=marks[node])
 
     @pytest.mark.skip(reason="Frequently fails in CI. Skipping until fixed as 
tracked by CASSANDRA-14148")
     @since('4.0')


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to