Updates post-M2

crates/resolved-cli/tests/cli.rs

@@ -231,11 +231,20 @@ fn missing_kernels_say_where_they_looked() {
 
 #[test]
 fn lighting_l1_says_what_it_is_missing() {
-    // boxwing.toml has no epoch and no earth_month: L1 cannot pick a month.
+    // Without an epoch or an earth_month, L1 cannot pick a month: boxwing.toml with its
+    // [appearance] removed.
+    let scene = out_dir().join("no-month.toml");
+    let models = repo().join("examples/models").canonicalize().unwrap();
+    let text = std::fs::read_to_string(repo().join("examples/scenes/boxwing.toml"))
+        .unwrap()
+        .replace("../models", models.to_str().unwrap())
+        .replace("[appearance]\nearth_month = 7\n", "");
+    assert!(!text.contains("earth_month"));
+    std::fs::write(&scene, text).unwrap();
     let no_month = resolved(&[
         "render",
         "--scene",
-        "examples/scenes/boxwing.toml",
+        scene.to_str().unwrap(),
         "--lighting",
         "L1",
         "--preview",
@@ -246,17 +255,10 @@ fn lighting_l1_says_what_it_is_missing() {
     assert!(stderr.contains("earth_month"), "{stderr}");
 
     // With a month but no data: the error names the file and the fetch script.
-    let scene = out_dir().join("month.toml");
-    let models = repo().join("examples/models").canonicalize().unwrap();
-    let text = std::fs::read_to_string(repo().join("examples/scenes/boxwing.toml"))
-        .unwrap()
-        .replace("../models", models.to_str().unwrap())
-        + "\n[appearance]\nearth_month = 7\n";
-    std::fs::write(&scene, text).unwrap();
     let no_data = resolved(&[
         "render",
         "--scene",
-        scene.to_str().unwrap(),
+        "examples/scenes/boxwing.toml",
         "--lighting",
         "L1",
         "--data",