aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoradrien <adrien@luxeylab.net>2021-12-28 10:42:40 +0100
committeradrien <adrien@luxeylab.net>2021-12-28 10:43:10 +0100
commit7760b9c58fd98dd934a8f553dd7462049f545cf4 (patch)
tree0e6b8c716955ea5bb5896c5dc4c8294b69e54137
parent3b9e75634aa06b6df0519e5d44fd6e5281712d09 (diff)
downloaddiplonat-7760b9c58fd98dd934a8f553dd7462049f545cf4.tar.gz
diplonat-7760b9c58fd98dd934a8f553dd7462049f545cf4.zip
repaired test, now that private IP is an Optionautodetect-private-ip
-rw-r--r--src/config/options_test.rs16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/config/options_test.rs b/src/config/options_test.rs
index 790a14e..6b91235 100644
--- a/src/config/options_test.rs
+++ b/src/config/options_test.rs
@@ -11,10 +11,6 @@ use crate::config::*;
fn minimal_valid_options() -> HashMap<String, String> {
let mut opts = HashMap::new();
opts.insert(
- "DIPLONAT_PRIVATE_IP".to_string(),
- "172.123.43.555".to_string(),
- );
- opts.insert(
"DIPLONAT_CONSUL_NODE_NAME".to_string(),
"consul_node".to_string(),
);
@@ -24,6 +20,10 @@ fn minimal_valid_options() -> HashMap<String, String> {
fn all_valid_options() -> HashMap<String, String> {
let mut opts = minimal_valid_options();
opts.insert("DIPLONAT_EXPIRATION_TIME".to_string(), "30".to_string());
+ opts.insert(
+ "DIPLONAT_PRIVATE_IP".to_string(),
+ "172.123.43.555".to_string(),
+ );
opts.insert("DIPLONAT_REFRESH_TIME".to_string(), "10".to_string());
opts.insert(
"DIPLONAT_CONSUL_URL".to_string(),
@@ -40,7 +40,6 @@ fn all_valid_options() -> HashMap<String, String> {
#[test]
#[should_panic]
fn err_empty_env() {
- std::env::remove_var("DIPLONAT_PRIVATE_IP");
std::env::remove_var("DIPLONAT_CONSUL_NODE_NAME");
ConfigOpts::from_env().unwrap();
}
@@ -60,10 +59,7 @@ fn ok_from_iter_minimal_valid_options() {
rt_config.firewall.refresh_time,
Duration::from_secs(REFRESH_TIME.into())
);
- assert_eq!(
- &rt_config.igd.private_ip,
- opts.get(&"DIPLONAT_PRIVATE_IP".to_string()).unwrap()
- );
+ assert!(rt_config.igd.private_ip.is_none());
assert_eq!(
rt_config.igd.expiration_time,
Duration::from_secs(EXPIRATION_TIME.into())
@@ -120,7 +116,7 @@ fn ok_from_iter_all_valid_options() {
);
assert_eq!(rt_config.firewall.refresh_time, refresh_time);
assert_eq!(
- &rt_config.igd.private_ip,
+ &rt_config.igd.private_ip.unwrap(),
opts.get(&"DIPLONAT_PRIVATE_IP".to_string()).unwrap()
);
assert_eq!(rt_config.igd.expiration_time, expiration_time);