[fix] flaky18 tests/swap/integration/bgsave.tcl

Author: warrick1016

tests/swap/integration/bgsave.tcl

@@ -27,16 +27,17 @@ start_server {tags {"swap bgsave"}} {
     for {set j 0} {$j < 10} {incr j} {
         test "check rdb generated by bgsave schedule round$j" {
             after 1000
+            set lastsave_before [r lastsave]
             r bgrewriteaof
-            r bgsave schedule
+            assert_match "Background saving*" [r bgsave schedule]
             waitForBgrewriteaof r
-            after 120 ;# serverCron only schedule bgsave once in 100ms
-            waitForBgsave r
-            wait_for_condition 10 5000 {
-                [s rdb_bgsave_in_progress] == 0
+            wait_for_condition 50 100 {
+                [s rdb_bgsave_in_progress] == 1 ||
+                [r lastsave] > $lastsave_before
             } else {
-                fail "Bgsave timeout."
+                fail "Scheduled BGSAVE did not start or finish."
             }
+            waitForBgsave r
             r debug reload nosave
         }
     }