clustertests: reduce flakiness

This commit makes two changes to the clustertests:

1. Reduces the propagation delay timeout when querying ReadySet to allow
   more time for ReadySet to reach eventual consistency. Some of our
   clustertests are failing intermittently due to timeouts while waiting
   for changes to be reflected in ReadySet. Increasing the timeout will
   give the tests more time to wait for eventual consistency, hopefully
   reducing or eliminating this kind of flakiness.
2. Fixes a bug where `EventuallyConsistentResults::empty_or` was not
   properly constructing an `EventuallyConsistentResults` that included
   an empty set of results as an allowed intermediate result.

Change-Id: I560324765098310701149caf0bad8998ebd16b69
Reviewed-on: https://gerrit.readyset.name/c/readyset/+/4666
Tested-by: Buildkite CI
Reviewed-by: Griffin Smith <[email protected]>

Author: ethowitz

readyset-clustertest/src/readyset_mysql.rs

@@ -13,7 +13,7 @@ use tokio::time::{sleep, timeout};
 use crate::utils::*;
 use crate::*;
 
-pub const PROPAGATION_DELAY_TIMEOUT: Duration = Duration::from_secs(60);
+pub const PROPAGATION_DELAY_TIMEOUT: Duration = Duration::from_secs(90);
 
 fn readyset_mysql(name: &str) -> DeploymentBuilder {
     DeploymentBuilder::new(name)

readyset-clustertest/src/utils.rs

@@ -73,7 +73,7 @@ where
     /// value. All other values should be rejected.
     pub fn empty_or(expected: &[T]) -> Self {
         Self {
-            intermediate: Vec::new(),
+            intermediate: vec![vec![]],
             expected: expected.to_vec(),
         }
     }