Fix shutdown of child processes in tests/cli.rs

examples/postgres-integration/.add.garble.rs

@@ -1,3 +1,3 @@
-pub fn main(x: u32, y: u32) -> u32 {
-    x + y
+pub fn main(x: u32, y: u32, z: u32) -> u32 {
+    x + y + z
 }

examples/postgres-integration/policies0.json

@@ -4,12 +4,13 @@
       "participants": [
         "http://localhost:8000",
         "http://localhost:8001",
-        "http://localhost:8002"
+        "http://localhost:8002",
+        "http://localhost:8003"
       ],
       "program": ".add.garble.rs",
       "leader": 0,
       "party": 0,
-      "input": "2u32"
+      "input": "0u32"
     }
   ]
 }

examples/postgres-integration/policies1.json

@@ -4,12 +4,13 @@
       "participants": [
         "http://localhost:8000",
         "http://localhost:8001",
-        "http://localhost:8002"
+        "http://localhost:8002",
+        "http://localhost:8003"
       ],
       "program": ".add.garble.rs",
       "leader": 0,
       "party": 1,
-      "input": "3u32"
+      "input": "1u32"
     }
   ]
 }

examples/postgres-integration/policies2.json

@@ -0,0 +1,16 @@
+{
+  "accepted": [
+    {
+      "participants": [
+        "http://localhost:8000",
+        "http://localhost:8001",
+        "http://localhost:8002",
+        "http://localhost:8003"
+      ],
+      "program": ".add.garble.rs",
+      "leader": 0,
+      "party": 2,
+      "input": "2u32"
+    }
+  ]
+}

examples/postgres-integration/preprocessor.json

@@ -4,7 +4,8 @@
       "participants": [
         "http://localhost:8000",
         "http://localhost:8001",
-        "http://localhost:8002"
+        "http://localhost:8002",
+        "http://localhost:8003"
       ],
       "program": "",
       "leader": 0,

examples/postgres-integration/tests/cli.rs

@@ -1,6 +1,7 @@
 use std::{
     io::{BufRead, BufReader},
     process::{exit, Command, Stdio},
+    sync::mpsc::channel,
     thread::{self, sleep},
     time::Duration,
 };
@@ -11,7 +12,7 @@ fn simulate() {
     println!("\n\n--- {millis}ms ---\n\n");
     let mut children = vec![];
     let mut cmd = Command::new("cargo")
-        .args(["run", "--", "--port=8002", "--config=preprocessor.json"])
+        .args(["run", "--", "--port=8003", "--config=preprocessor.json"])
         .stdout(Stdio::piped())
         .stderr(Stdio::piped())
         .spawn()
@@ -31,7 +32,7 @@ fn simulate() {
         }
     });
     children.push(cmd);
-    for p in [1] {
+    for p in [1, 2] {
         let port = format!("--port=800{p}");
         let config = format!("--config=policies{p}.json");
         let args = vec!["run", "--", &port, &config];
@@ -66,11 +67,12 @@ fn simulate() {
     let mut stdout = BufReader::new(cmd.stdout.take().unwrap()).lines();
     let mut stderr = BufReader::new(cmd.stderr.take().unwrap()).lines();
     children.push(cmd);
+    let (s, r) = channel::<()>();
     thread::spawn(move || {
         while let Some(Ok(line)) = stdout.next() {
             println!("party0> {line}");
-            if line == "Output is 5u32" {
-                exit(0);
+            if line == "Output is 3u32" {
+                return s.send(()).unwrap();
             }
         }
     });
@@ -79,10 +81,15 @@ fn simulate() {
             eprintln!("party0> {line}");
         }
     });
-    sleep(Duration::from_secs(10));
-    eprintln!("Test did not complete!");
+    let result = r.recv_timeout(Duration::from_secs(10));
     for mut child in children {
         child.kill().unwrap();
     }
-    exit(-1);
+    match result {
+        Ok(_) => exit(0),
+        Err(_) => {
+            eprintln!("Test did not complete!");
+            exit(-1);
+        }
+    }
 }