fix tests

Author: joshua-spacetime

crates/smoketests/tests/smoketests/auto_migration.rs

@@ -343,11 +343,9 @@ fn test_add_table_columns() {
     // Subscribe to person table changes multiple times to simulate active clients
     let mut subs = Vec::with_capacity(NUM_SUBSCRIBERS);
     for _ in 0..NUM_SUBSCRIBERS {
-        // We need unconfirmed reads for the updates to arrive properly.
-        // Otherwise, there's a race between module teardown in publish, vs subscribers
-        // getting the row deletion they expect.
+        // The migration below should disconnect all existing subscribers.
         subs.push(
-            test.subscribe_background_unconfirmed(&["select * from person"], 5)
+            test.subscribe_background_until_closed(&["select * from person"])
                 .unwrap(),
         );
     }
@@ -389,9 +387,8 @@ fn test_add_table_columns() {
     test.call("add_person", &["Robert2"]).unwrap();
 
     // Validate all subscribers were disconnected after first upgrade
-    for (i, sub) in subs.into_iter().enumerate() {
-        let rows = sub.collect().unwrap();
-        assert_eq!(rows.len(), 2, "Subscriber {i} received unexpected rows: {rows:?}");
+    for sub in subs {
+        sub.collect().unwrap();
     }
 
     // Second upgrade

crates/smoketests/tests/smoketests/views.rs

@@ -592,7 +592,7 @@ fn test_view_primary_key_auto_migration_disconnects_clients() {
         .build();
 
     let sub = test
-        .subscribe_background_unconfirmed(&["select * from player"], 2)
+        .subscribe_background_until_closed(&["select * from player"])
         .unwrap();
 
     test.use_precompiled_module("views-primary-key-auto-migrate-updated");
@@ -672,7 +672,7 @@ fn test_subscribing_with_different_identities() {
 
     test.new_identity().unwrap();
 
-    let sub = test.subscribe_background(&["select * from my_player"], 2).unwrap();
+    let sub = test.subscribe_background(&["select * from my_player"], 1).unwrap();
     test.call("insert_player", &["Bob"]).unwrap();
     let events = sub.collect().unwrap();