Add tests for cloned shell

matklad · Mar 27, 2024 · 8590604 · 8590604
1 parent 57c4d63
commit 8590604
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 18 deletions.
diff --git a/tests/it/env.rs b/tests/it/env.rs
@@ -11,29 +11,34 @@ fn test_env() {
     let v1 = "xshell_test_123";
     let v2 = "xshell_test_456";
 
-    assert_env(cmd!(sh, "xecho -$ {v1}").env(v1, "123"), &[(v1, Some("123"))]);
-
-    assert_env(
-        cmd!(sh, "xecho -$ {v1} {v2}").envs([(v1, "123"), (v2, "456")].iter().copied()),
-        &[(v1, Some("123")), (v2, Some("456"))],
-    );
-    assert_env(
-        cmd!(sh, "xecho -$ {v1} {v2}")
-            .envs([(v1, "123"), (v2, "456")].iter().copied())
-            .env_remove(v2),
-        &[(v1, Some("123")), (v2, None)],
-    );
-    assert_env(
-        cmd!(sh, "xecho -$ {v1} {v2}")
-            .envs([(v1, "123"), (v2, "456")].iter().copied())
-            .env_remove("nothing"),
-        &[(v1, Some("123")), (v2, Some("456"))],
-    );
+    let cloned_sh = sh.clone();
+
+    for sh in [&sh, &cloned_sh] {
+        assert_env(cmd!(sh, "xecho -$ {v1}").env(v1, "123"), &[(v1, Some("123"))]);
+
+        assert_env(
+            cmd!(sh, "xecho -$ {v1} {v2}").envs([(v1, "123"), (v2, "456")].iter().copied()),
+            &[(v1, Some("123")), (v2, Some("456"))],
+        );
+        assert_env(
+            cmd!(sh, "xecho -$ {v1} {v2}")
+                .envs([(v1, "123"), (v2, "456")].iter().copied())
+                .env_remove(v2),
+            &[(v1, Some("123")), (v2, None)],
+        );
+        assert_env(
+            cmd!(sh, "xecho -$ {v1} {v2}")
+                .envs([(v1, "123"), (v2, "456")].iter().copied())
+                .env_remove("nothing"),
+            &[(v1, Some("123")), (v2, Some("456"))],
+        );
+    }
 
     let _g1 = sh.push_env(v1, "foobar");
     let _g2 = sh.push_env(v2, "quark");
 
     assert_env(cmd!(sh, "xecho -$ {v1} {v2}"), &[(v1, Some("foobar")), (v2, Some("quark"))]);
+    assert_env(cmd!(cloned_sh, "xecho -$ {v1} {v2}"), &[(v1, None), (v2, None)]);
 
     assert_env(
         cmd!(sh, "xecho -$ {v1} {v2}").env(v1, "wombo"),

diff --git a/tests/it/main.rs b/tests/it/main.rs
@@ -311,6 +311,18 @@ fn test_push_env() {
     assert_eq!(e5, e1);
 }
 
+#[test]
+fn test_push_env_clone() {
+    let sh = setup();
+
+    assert!(sh.var_os(VAR).is_none());
+    let guard = sh.push_env(VAR, "1");
+    let cloned = sh.clone();
+    drop(guard);
+    assert_eq!(sh.var_os(VAR), None);
+    assert_eq!(cloned.var_os(VAR), Some("1".into()));
+}
+
 #[test]
 fn test_push_env_and_set_var() {
     let sh = setup();