Add the second persist test.

tests/persist_tests.rs

@@ -25,7 +25,7 @@ fn persist() -> config::Result<()> {
         cfg.connect(i);
     }
 
-    cfg.one(12, SERVERS, true);
+    cfg.one(12, SERVERS, true)?;
 
     let leader1 = cfg.check_one_leader()?;
     cfg.disconnect(leader1);
@@ -36,7 +36,7 @@ fn persist() -> config::Result<()> {
 
     let leader2 = cfg.check_one_leader()?;
     cfg.disconnect(leader2);
-    cfg.one(14, SERVERS - 1, true);
+    cfg.one(14, SERVERS - 1, true)?;
     cfg.start1(leader2)?;
     cfg.connect(leader2);
 
@@ -56,3 +56,55 @@ fn persist() -> config::Result<()> {
     drop(_guard);
     Ok(())
 }
+
+#[test]
+fn persist2() -> config::Result<()> {
+    const SERVERS: usize = 5;
+    let cfg = config::make_config(SERVERS, false);
+    let _guard = cfg.deferred_cleanup();
+
+    cfg.begin("Test (2C): more persistence");
+
+    let mut index = 1;
+    for _ in 0..5 {
+        cfg.one(10 + index, SERVERS, true)?;
+        index += 1;
+
+        let leader1 = cfg.check_one_leader()?;
+
+        cfg.disconnect((leader1 + 1) % SERVERS);
+        cfg.disconnect((leader1 + 2) % SERVERS);
+
+        cfg.one(10 + index, SERVERS - 2, true)?;
+
+        index += 1;
+
+        cfg.disconnect((leader1 + 0) % SERVERS);
+        cfg.disconnect((leader1 + 3) % SERVERS);
+        cfg.disconnect((leader1 + 4) % SERVERS);
+
+        cfg.start1((leader1 + 1) % SERVERS)?;
+        cfg.start1((leader1 + 2) % SERVERS)?;
+        cfg.connect((leader1 + 1) % SERVERS);
+        cfg.connect((leader1 + 2) % SERVERS);
+
+        config::sleep_election_timeouts(1);
+
+        cfg.start1((leader1 + 3) % SERVERS)?;
+        cfg.connect((leader1 + 3) % SERVERS);
+
+        cfg.one(10 + index, SERVERS - 2, true)?;
+
+        index += 1;
+
+        cfg.connect((leader1 + 4) % SERVERS);
+        cfg.connect((leader1 + 0) % SERVERS);
+    }
+
+    cfg.one(1000, SERVERS, true)?;
+
+    cfg.end();
+
+    drop(_guard);
+    Ok(())
+}