[E2E] fix flaky config tests with temp_env (#2105)

use-ink · Feb 8, 2024 · ae81655 · ae81655
1 parent 7525d40
commit ae81655
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 10 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/e2e/macro/Cargo.toml b/crates/e2e/macro/Cargo.toml
@@ -28,5 +28,8 @@ syn = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
 
+[dev-dependencies]
+temp-env = "0.3.6"
+
 [features]
 drink = []
diff --git a/crates/e2e/macro/src/config.rs b/crates/e2e/macro/src/config.rs
@@ -173,11 +173,19 @@ mod tests {
             Backend::Node(node_config) => {
                 assert_eq!(node_config, Node::Auto);
 
-                std::env::remove_var("CONTRACTS_NODE_URL");
-                assert_eq!(node_config.url(), None);
-
-                std::env::set_var("CONTRACTS_NODE_URL", "ws://127.0.0.1:9000");
-                assert_eq!(node_config.url(), Some(String::from("ws://127.0.0.1:9000")));
+                temp_env::with_vars([("CONTRACTS_NODE_URL", None::<&str>)], || {
+                    assert_eq!(node_config.url(), None);
+                });
+
+                temp_env::with_vars(
+                    [("CONTRACTS_NODE_URL", Some("ws://127.0.0.1:9000"))],
+                    || {
+                        assert_eq!(
+                            node_config.url(),
+                            Some(String::from("ws://127.0.0.1:9000"))
+                        );
+                    },
+                );
             }
             _ => panic!("Expected Backend::Node"),
         }
@@ -195,11 +203,19 @@ mod tests {
             Backend::Node(node_config) => {
                 assert_eq!(node_config, Node::Url("ws://0.0.0.0:9999".to_owned()));
 
-                std::env::remove_var("CONTRACTS_NODE_URL");
-                assert_eq!(node_config.url(), Some("ws://0.0.0.0:9999".to_owned()));
-
-                std::env::set_var("CONTRACTS_NODE_URL", "ws://127.0.0.1:9000");
-                assert_eq!(node_config.url(), Some(String::from("ws://127.0.0.1:9000")));
+                temp_env::with_vars([("CONTRACTS_NODE_URL", None::<&str>)], || {
+                    assert_eq!(node_config.url(), Some("ws://0.0.0.0:9999".to_owned()));
+                });
+
+                temp_env::with_vars(
+                    [("CONTRACTS_NODE_URL", Some("ws://127.0.0.1:9000"))],
+                    || {
+                        assert_eq!(
+                            node_config.url(),
+                            Some(String::from("ws://127.0.0.1:9000"))
+                        );
+                    },
+                );
             }
             _ => panic!("Expected Backend::Node"),
         }