✕ Run #169 failed

0.0sfetching andymccall/oxygen for state 073a2115995f+0912a0337a95+0ad273ca4fcf+11c958021e1a+11e2b98a3a39+25c6adfaa559+2bf22305bc48+36e51aa806c6+3d7120efe04a+4161262eeb29+60a1223c894f+69692f14b80f+7df9007b163c+7eac74abc586+8349c327fe83+89a1d0243544+930e5f3f1682+99e3e0af08df+a17fc622ca43+abaa8d517631+acadb5ed28a1+adec9a0796b8+b288cd254343+b4fa2bc1ca6a+bbe654f95806+bd445775b94e+bdd894b548e4+be451356e3ef+cd19603782bf+d2e3c39da1b1+dfe165877345+e0d56dfca51d+ef26f9a28790+f57bf6702628+fd280228bdc2
3.4sbooting a microVM: 1 vCPU, 1024 MiB, rootfs a3b49f36a2ad
1.0sDiff in /src/tests/cli_json.rs:606:
1.0s     let home = tmp.path().join("home");
1.0s     std::fs::create_dir_all(&home).unwrap();
1.0s     let repo = tmp.path().join("r");
1.0s-    assert_eq!(oxy(tmp.path(), &home, &["init", repo.to_str().unwrap()]).0, 0);
1.0s+    assert_eq!(
1.0s+        oxy(tmp.path(), &home, &["init", repo.to_str().unwrap()]).0,
1.0s+        0
1.0s+    );
1.0s     write(&repo, "a.txt", "a\n");
1.0s     write(&repo, "b.txt", "b\n");
1.0s     assert_eq!(oxy(&repo, &home, &["commit", "-m", "both files"]).0, 0);
1.0sDiff in /src/tests/cli_json.rs:621:
1.0s     let lines: Vec<&str> = out.lines().collect();
1.0s     // The working copy, then "edit b", "edit a" beside it, then their base.
1.0s     assert!(lines[0].starts_with('@'), "{out}");
1.0s-    assert!(lines.iter().any(|l| l.starts_with("|-'") && l.contains("edit a")), "{out}");
1.0s-    assert!(lines.iter().any(|l| l.starts_with("| *") || l.starts_with("| o")), "{out}");
1.0s+    assert!(
1.0s+        lines
1.0s+            .iter()
1.0s+            .any(|l| l.starts_with("|-'") && l.contains("edit a")),
1.0s+        "{out}"
1.0s+    );
1.0s+    assert!(
1.0s+        lines
1.0s+            .iter()
1.0s+            .any(|l| l.starts_with("| *") || l.starts_with("| o")),
1.0s+        "{out}"
1.0s+    );
1.0s     let base = lines.iter().position(|l| l.contains("both files")).unwrap();
1.0s-    assert!(lines[base - 1].contains('#'), "the header line carries the hash: {out}");
1.0s+    assert!(
1.0s+        lines[base - 1].contains('#'),
1.0s+        "the header line carries the hash: {out}"
1.0s+    );
1.0s }
1.0s