Skip to content

Commit 9d0b771

Browse files
committed
Fix Test
1 parent e68188b commit 9d0b771

File tree

1 file changed

+13
-23
lines changed

1 file changed

+13
-23
lines changed

src/diff.rs

Lines changed: 13 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -148,32 +148,22 @@ mod tests {
148148
fn nominal_test() {
149149
let mut logger = DummyLogger::default();
150150

151-
let env_vars = vec![(
152-
"MANPATH".to_string(),
153-
"/opt/homebrew/share/man:/opt/homebrew/share/man".to_string(),
154-
)];
151+
let env_vars = vec![
152+
("VAR_A".to_string(), "/added:/existent".to_string()),
153+
("VAR_B".to_string(), "/added".to_string()),
154+
("VAR_C".to_string(), "/added:/existent".to_string()),
155+
];
155156

156-
let data = r#"8a3f0f24bc3fd12d:{"scalars":[{"name":"REDIS_URL","original":null,"current":"redis://web.railgun:6379/0"},{"name":"CPPFLAGS","original":null,"current":"-DPNG_ARM_NEON_OPT=0"},{"name":"NVM_BIN","original":null,"current":"/Users/xade/.nvm/versions/node/v16.14.2/bin"},{"name":"NVM_PATH","original":null,"current":"/Users/xade/.nvm/versions/node/v16.14.2/lib/node"},{"name":"NVM_DIR","original":null,"current":"/Users/xade/.nvm"},{"name":"NGINX_HOST","original":null,"current":"web.railgun"},{"name":"HOST_BIND_IP","original":null,"current":"192.168.64.1"},{"name":"REDIS_PORT","original":null,"current":"6379"},{"name":"REDIS_HOST","original":null,"current":"web.railgun"},{"name":"NGINX_PORT","original":null,"current":"80"},{"name":"HOST_WEBPACK_IP","original":null,"current":"192.168.64.254"}],"lists":[{"name":"MANPATH","additions":["/Users/xade/.nvm/versions/node/v16.14.2/share/man"],"deletions":[]},{"name":"PATH","additions":["/opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk/bin","/Users/xade/.dev/yarn/1.22.15/bin","/Users/xade/.nvm/versions/node/v16.14.2/bin","/opt/homebrew/opt/[email protected]/bin"],"deletions":[]},{"name":"PKG_CONFIG_PATH","additions":["/opt/homebrew/lib/pkgconfig","/opt/homebrew/opt/zstd/lib/pkgconfig","/opt/homebrew/opt/xz/lib/pkgconfig","/opt/homebrew/opt/sqlite/lib/pkgconfig","/opt/homebrew/opt/readline/lib/pkgconfig","/opt/homebrew/opt/[email protected]/lib/pkgconfig","/opt/homebrew/opt/pcre2/lib/pkgconfig","/opt/homebrew/opt/[email protected]/lib/pkgconfig","/opt/homebrew/opt/lz4/lib/pkgconfig","/opt/homebrew/opt/libsodium/lib/pkgconfig","/opt/homebrew/opt/libevent/lib/pkgconfig","/opt/homebrew/opt/icu4c/lib/pkgconfig","/opt/homebrew/opt/glog/lib/pkgconfig","/opt/homebrew/opt/gflags/lib/pkgconfig","/opt/homebrew/opt/folly/lib/pkgconfig","/opt/homebrew/opt/fmt/lib/pkgconfig","/usr/lib/pkgconfig"],"deletions":[]}]}"#;
157-
let result = run_with_logger(&mut logger, env_vars, true, false, data.to_string());
157+
let data = r#"62b0b9f86cda84d4:{"scalars":[],"lists":[{"name":"VAR_C","additions":["/added"],"deletions":["/removed"]},{"name":"VAR_B","additions":["/added"],"deletions":[]},{"name":"VAR_A","additions":["/added"],"deletions":[]}]}"#;
158+
let result = run_with_logger(&mut logger, env_vars, false, false, data.to_string());
158159

159160
let expected: Vec<_> = vec![
160-
"- MANPATH=/opt/homebrew/share/man:/opt/homebrew/share/man",
161-
"+ MANPATH=/opt/homebrew/share/man:/opt/homebrew/share/man",
162-
"+ CPPFLAGS=-DPNG_ARM_NEON_OPT=0",
163-
"+ HOST_BIND_IP=192.168.64.1",
164-
"+ HOST_WEBPACK_IP=192.168.64.254",
165-
"+ NGINX_HOST=web.railgun",
166-
"+ NGINX_PORT=80",
167-
"+ NVM_BIN=/Users/xade/.nvm/versions/node/v16.14.2/bin",
168-
"+ NVM_DIR=/Users/xade/.nvm",
169-
"+ NVM_PATH=/Users/xade/.nvm/versions/node/v16.14.2/lib/node",
170-
"+ REDIS_HOST=web.railgun",
171-
"+ REDIS_PORT=6379",
172-
"+ REDIS_URL=redis://web.railgun:6379/0",
173-
"- PATH=",
174-
"+ PATH=",
175-
"- PKG_CONFIG_PATH=",
176-
"+ PKG_CONFIG_PATH=",
161+
"- VAR_A=/existent",
162+
"+ VAR_A=/added:/existent",
163+
"- VAR_B=",
164+
"+ VAR_B=/added",
165+
"- VAR_C=/removed:/existent",
166+
"+ VAR_C=/added:/existent",
177167
]
178168
.iter()
179169
.map(ToString::to_string)

0 commit comments

Comments
 (0)