Fix tests with enoent error message on non-english systems.

diff --git a/crates/cargo-test-support/src/lib.rs b/crates/cargo-test-support/src/lib.rs
index c99259fb29edd2424a5c46b4fa08a9578a801414..d0748189b320a950b59f43d56ce4a8e42fa4c440 100644 (file)
--- a/crates/cargo-test-support/src/lib.rs
+++ b/crates/cargo-test-support/src/lib.rs
@@ -1841,10 +1841,6 @@ pub fn symlink_supported() -> bool {
 }
 
 /// The error message for ENOENT.
-///
-/// It's generally not good to match against OS error messages, but I think
-/// this one is relatively stable.
-#[cfg(windows)]
-pub const NO_SUCH_FILE_ERR_MSG: &str = "The system cannot find the file specified. (os error 2)";
-#[cfg(not(windows))]
-pub const NO_SUCH_FILE_ERR_MSG: &str = "No such file or directory (os error 2)";
+pub fn no_such_file_err_msg() -> String {
+    std::io::Error::from_raw_os_error(2).to_string()
+}

diff --git a/tests/testsuite/config_include.rs b/tests/testsuite/config_include.rs
index f1c6b63f4d89553dfecf9af1128f2aafed39de4e..933eb1f5ede202a45d22bccce86b7c2107e5b77b 100644 (file)
--- a/tests/testsuite/config_include.rs
+++ b/tests/testsuite/config_include.rs
@@ -3,7 +3,7 @@
 use super::config::{
     assert_error, assert_match, read_output, write_config, write_config_at, ConfigBuilder,
 };
-use cargo_test_support::{paths, NO_SUCH_FILE_ERR_MSG};
+use cargo_test_support::{no_such_file_err_msg, paths};
 use std::fs;
 
 #[cargo_test]
@@ -92,7 +92,7 @@ Caused by:
 
 Caused by:
   {}",
-            NO_SUCH_FILE_ERR_MSG
+            no_such_file_err_msg()
         ),
     );
 }
@@ -179,7 +179,7 @@ Caused by:
 
 Caused by:
   {}",
-            NO_SUCH_FILE_ERR_MSG
+            no_such_file_err_msg()
         ),
     );
 }

diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs
index 01a81fc3e290348d2ef74275f74b3f6feec93b25..3761d0b11aba0c47e7325b9d19cfcda259125840 100644 (file)
--- a/tests/testsuite/install.rs
+++ b/tests/testsuite/install.rs
@@ -11,7 +11,7 @@ use cargo_test_support::install::{
 use cargo_test_support::paths;
 use cargo_test_support::registry::Package;
 use cargo_test_support::{
-    basic_manifest, cargo_process, project, symlink_supported, t, NO_SUCH_FILE_ERR_MSG,
+    basic_manifest, cargo_process, no_such_file_err_msg, project, symlink_supported, t,
 };
 
 fn pkg(name: &str, vers: &str) {
@@ -845,7 +845,7 @@ fn uninstall_cwd_no_project() {
 
 Caused by:
   {err_msg}",
-            err_msg = NO_SUCH_FILE_ERR_MSG,
+            err_msg = no_such_file_err_msg(),
         ))
         .run();
 }