diff options
| author | David Sherret <dsherret@users.noreply.github.com> | 2023-06-10 11:09:45 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-10 11:09:45 -0400 |
| commit | 7f15126f23d97f20a4fb33e43136cd4d13825863 (patch) | |
| tree | 85d77389969b31999680059e65954a9fa863758e /cli/tests/integration/upgrade_tests.rs | |
| parent | f3326eebd6af2aaca1543e8cb543a7b16762bc96 (diff) | |
chore(tests): test_util - Add `PathRef` (#19450)
This adds a new `PathRef` struct to test_util for making it easier to
work with paths in test code. I'm going to expand on this more in the
future.
Diffstat (limited to 'cli/tests/integration/upgrade_tests.rs')
| -rw-r--r-- | cli/tests/integration/upgrade_tests.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cli/tests/integration/upgrade_tests.rs b/cli/tests/integration/upgrade_tests.rs index f4eaa03c9..6eed9e7a1 100644 --- a/cli/tests/integration/upgrade_tests.rs +++ b/cli/tests/integration/upgrade_tests.rs @@ -12,7 +12,7 @@ use test_util::TempDir; fn upgrade_in_tmpdir() { let temp_dir = TempDir::new(); let exe_path = temp_dir.path().join("deno"); - let _ = std::fs::copy(util::deno_exe_path(), &exe_path).unwrap(); + util::deno_exe_path().copy(&exe_path); assert!(exe_path.exists()); let _mtime1 = std::fs::metadata(&exe_path).unwrap().modified().unwrap(); let status = Command::new(&exe_path) @@ -34,7 +34,7 @@ fn upgrade_in_tmpdir() { fn upgrade_with_space_in_path() { let temp_dir = TempDir::new_with_prefix("directory with spaces"); let exe_path = temp_dir.path().join("deno"); - let _ = std::fs::copy(util::deno_exe_path(), &exe_path).unwrap(); + util::deno_exe_path().copy(&exe_path); assert!(exe_path.exists()); let status = Command::new(&exe_path) .arg("upgrade") @@ -54,7 +54,7 @@ fn upgrade_with_space_in_path() { fn upgrade_with_version_in_tmpdir() { let temp_dir = TempDir::new(); let exe_path = temp_dir.path().join("deno"); - let _ = std::fs::copy(util::deno_exe_path(), &exe_path).unwrap(); + util::deno_exe_path().copy(&exe_path); assert!(exe_path.exists()); let _mtime1 = std::fs::metadata(&exe_path).unwrap().modified().unwrap(); let status = Command::new(&exe_path) @@ -83,7 +83,7 @@ fn upgrade_with_version_in_tmpdir() { fn upgrade_with_canary_in_tmpdir() { let temp_dir = TempDir::new(); let exe_path = temp_dir.path().join("deno"); - let _ = std::fs::copy(util::deno_exe_path(), &exe_path).unwrap(); + util::deno_exe_path().copy(&exe_path); assert!(exe_path.exists()); let _mtime1 = std::fs::metadata(&exe_path).unwrap().modified().unwrap(); let status = Command::new(&exe_path) @@ -113,7 +113,7 @@ fn upgrade_with_out_in_tmpdir() { let temp_dir = TempDir::new(); let exe_path = temp_dir.path().join("deno"); let new_exe_path = temp_dir.path().join("foo"); - let _ = std::fs::copy(util::deno_exe_path(), &exe_path).unwrap(); + util::deno_exe_path().copy(&exe_path); assert!(exe_path.exists()); let mtime1 = std::fs::metadata(&exe_path).unwrap().modified().unwrap(); let status = Command::new(&exe_path) @@ -121,7 +121,7 @@ fn upgrade_with_out_in_tmpdir() { .arg("--version") .arg("1.11.5") .arg("--output") - .arg(new_exe_path.to_str().unwrap()) + .arg(&new_exe_path) .spawn() .unwrap() .wait() @@ -149,7 +149,7 @@ fn upgrade_with_out_in_tmpdir() { fn upgrade_invalid_stable_version() { let temp_dir = TempDir::new(); let exe_path = temp_dir.path().join("deno"); - let _ = std::fs::copy(util::deno_exe_path(), &exe_path).unwrap(); + util::deno_exe_path().copy(&exe_path); assert!(exe_path.exists()); let output = Command::new(&exe_path) .arg("upgrade") @@ -174,7 +174,7 @@ fn upgrade_invalid_stable_version() { fn upgrade_invalid_canary_version() { let temp_dir = TempDir::new(); let exe_path = temp_dir.path().join("deno"); - let _ = std::fs::copy(util::deno_exe_path(), &exe_path).unwrap(); + util::deno_exe_path().copy(&exe_path); assert!(exe_path.exists()); let output = Command::new(&exe_path) .arg("upgrade") |