fix errors and tests

nextest-rs · Apr 21, 2024 · 7800d33 · 7800d33
1 parent 05ed2d2
commit 7800d33
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,10 +13,9 @@ rust-version = "1.65"
 
 [dependencies]
 camino = "1.1.6"
+fancy-regex = "0.13.0"
 libtest-mimic = "0.7.2"
-regex = "1.10.4"
 walkdir = "2.5.0"
-fancy_regex = "0.13.0"
 
 [[test]]
 name = "example"

diff --git a/src/runner.rs b/src/runner.rs
@@ -58,7 +58,7 @@ impl Requirements {
         let tests: Vec<_> = utils::iterate_directory(&self.root)
             .filter_map(|path_res| {
                 let path = path_res.expect("error while iterating directory");
-                if re.is_match(path.as_str()) {
+                if re.is_match(path.as_str()).unwrap_or_else(|_| panic!("Problem with matching following pattern : '{}'", self.pattern)) {
                     let testfn = self.test;
                     let name = utils::derive_test_name(&self.root, &path, &self.test_name);
                     Some(Trial::test(name, move || {

diff --git a/tests/example.rs b/tests/example.rs
@@ -20,8 +20,8 @@ fn test_artifact_utf8(path: &Utf8Path) -> Result<()> {
 datatest_stable::harness!(
     test_artifact,
     "tests/files",
-    r"^.*/*",
+    r"^.*(?<!\.skip)\.txt",
     test_artifact_utf8,
     "tests/files",
-    r"^.*/*",
+    r"^.*(?<!\.skip)\.txt",
 );
diff --git a/tests/files/a → tests/files/a.txt b/tests/files/a → tests/files/a.txt
diff --git a/tests/files/b → tests/files/b.txt b/tests/files/b → tests/files/b.txt
diff --git a/tests/files/c.skip.txt b/tests/files/c.skip.txt
@@ -0,0 +1 @@
+baz foo