summaryrefslogtreecommitdiffhomepage
path: root/talpid-core
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2018-06-19 08:11:51 +0100
committerEmīls Piņķis <emils@mullvad.net>2018-06-21 16:02:50 +0100
commit98cceca9a1f1ce0fc1efcc0d790640e8aa6b4fbd (patch)
tree6b0fe63f0ab98ca774e6afbfb6a9cdaabd988ba1 /talpid-core
parent6efdbb6f9344491e082c5eb53c1c42c51655b3fe (diff)
downloadmullvadvpn-98cceca9a1f1ce0fc1efcc0d790640e8aa6b4fbd.tar.xz
mullvadvpn-98cceca9a1f1ce0fc1efcc0d790640e8aa6b4fbd.zip
Fix tests in system_state.rs
Diffstat (limited to 'talpid-core')
-rw-r--r--talpid-core/src/firewall/system_state.rs16
1 files changed, 10 insertions, 6 deletions
diff --git a/talpid-core/src/firewall/system_state.rs b/talpid-core/src/firewall/system_state.rs
index 88b5acc6f2..e99fc5033c 100644
--- a/talpid-core/src/firewall/system_state.rs
+++ b/talpid-core/src/firewall/system_state.rs
@@ -68,9 +68,10 @@ mod tests {
#[test]
fn can_create_backup() {
let temp_dir = tempfile::tempdir().expect("failed to crate temp dir");
+ let temp_file = temp_dir.path().join("test_file");
let mock_system_state: Vec<_> = b"8.8.8.8\n8.8.4.4\n".to_vec();
- let writer = SystemStateWriter::new(&temp_dir);
+ let writer = SystemStateWriter::new(&temp_file);
writer
.write_backup(&mock_system_state)
.expect("failed to write system state");
@@ -90,8 +91,9 @@ mod tests {
#[test]
fn can_succeed_without_backup() {
let temp_dir = tempfile::tempdir().expect("failed to crate temp dir");
+ let temp_file = temp_dir.path().join("test_file");
- let writer = SystemStateWriter::new(&temp_dir);
+ let writer = SystemStateWriter::new(&temp_file);
let backup = writer
.consume_state_backup()
.expect("error when reading system state backup");
@@ -101,7 +103,7 @@ mod tests {
#[cfg(unix)]
#[test]
fn cant_read_without_access() {
- let temp_dir = PathBuf::from("/dev/null");
+ let temp_dir = PathBuf::from("/dev/null/bogus");
let writer = SystemStateWriter::new(&temp_dir);
let mock_system_state: Vec<_> = b"8.8.8.8\n8.8.4.4\n".to_vec();
@@ -120,8 +122,9 @@ mod tests {
#[test]
fn can_remove_when_no_backup_exists() {
let temp_dir = tempfile::tempdir().expect("failed to crate temp dir");
+ let temp_file = temp_dir.path().join("test_file");
- let writer = SystemStateWriter::new(&temp_dir);
+ let writer = SystemStateWriter::new(&temp_file);
writer.remove_state_file().expect(
"Encountered IO error when running remove_state_file when no state file exists",
);
@@ -130,7 +133,8 @@ mod tests {
#[test]
fn can_remove_backup() {
let temp_dir = tempfile::tempdir().expect("failed to crate temp dir");
- let writer = SystemStateWriter::new(&temp_dir);
+ let temp_file = temp_dir.path().join("test_file");
+ let writer = SystemStateWriter::new(&temp_file);
let mock_system_state = b"8.8.8.8\n8.8.4.4\n".to_vec();
writer
@@ -149,7 +153,7 @@ mod tests {
#[cfg(unix)]
#[test]
fn cant_remove_backup_with_io_error() {
- let temp_dir = PathBuf::from("/dev/null");
+ let temp_dir = PathBuf::from("/dev/null/bogus");
let writer = SystemStateWriter::new(&temp_dir);
let removal_failure = writer