Use remote repo and fix a bug in regex matching of .fmf

add release note
teemtee · Aug 7, 2024 · f885db6 · f885db6
1 parent 6c0bdfc
commit f885db6
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/docs/releases.rst b/docs/releases.rst
@@ -34,6 +34,9 @@ support for :ref:`cpu.vendor-name</spec/hardware/cpu>` and
 The linting of tests, plans and stories has been extended by detecting
 duplicate ids.
 
+Test directories pruning now works correctly for nested fmf trees
+and there is also a test for it.
+
 tmt-1.34
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/tests/discover/prune.sh b/tests/discover/prune.sh
@@ -7,17 +7,18 @@ rlJournalStart
         rlRun "run=\$(mktemp -d)"
     rlPhaseEnd
 
-    rlPhaseStartTest "Discover only"
+    rlPhaseStartTest "Discover local"
         rlRun -s "tmt run -i $run discover plans --name plan tests --name test1"
         rlAssertExists "$run/plan/discover/default-0/tests/test1"
         rlAssertNotExists "$run/plan/discover/default-0/tests/test2"
         rlAssertNotExists "$run/plan/discover/default-0/tests/some-file"
     rlPhaseEnd
 
-    rlPhaseStartTest "Discover only with path"
-        rlRun -s "tmt run -i $run discover plans --name nested tests --name test1"
-        rlAssertExists "$run/nested/discover/default-0/tests/test1"
-        rlAssertNotExists "$run/nested/discover/default-0/tests/test2"
+    rlPhaseStartTest "Discover remote with path"
+        rlRun -s "tmt run -i $run discover plans --name nested tests --name file"
+        rlAssertExists "$run/nested/discover/default-0/tests/file/test.sh"
+        rlAssertExists "$run/nested/discover/default-0/tests/scripts/random_file.sh"
+        rlAssertNotExists "$run/nested/discover/default-0/tests/dir-without-fmf"
     rlPhaseEnd
 
     rlPhaseStartCleanup

diff --git a/tests/discover/prune/nested.fmf b/tests/discover/prune/nested.fmf
@@ -1,5 +1,6 @@
 discover:
     how: fmf
+    url: https://github.com/teemtee/tests
     path: nested
     prune: true
 provision:

diff --git a/tests/discover/prune/nested/.fmf/version b/tests/discover/prune/nested/.fmf/version
diff --git a/tests/discover/prune/nested/test1/main.fmf b/tests/discover/prune/nested/test1/main.fmf
diff --git a/tests/discover/prune/nested/test2/main.fmf b/tests/discover/prune/nested/test2/main.fmf
diff --git a/tmt/steps/discover/fmf.py b/tmt/steps/discover/fmf.py
@@ -574,7 +574,7 @@ def do_the_discovery(self, path: Optional[Path] = None) -> None:
         if prune:
             # Save fmf metadata
             clonedir = self.clone_dirpath / 'tests'
-            for path in tmt.utils.filter_paths(tree_path, ['.fmf']):
+            for path in tmt.utils.filter_paths(tree_path, [r'\.fmf']):
                 shutil.copytree(
                     path,
                     clonedir / path.relative_to(tree_path),