revert temporary testing

bioconda · Mar 17, 2024 · 46500b5 · 46500b5
1 parent 1edf2e0
commit 46500b5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/.github/workflows/GithubActionTests.yml b/.github/workflows/GithubActionTests.yml
@@ -11,10 +11,9 @@ jobs:
     strategy:
       matrix:
         py_test_marker:
-          # - not long_running_1 and not long_running_2
-          # - long_running_1
-          # - long_running_2
-          - tmp
+          - not long_running_1 and not long_running_2
+          - long_running_1
+          - long_running_2
 
     steps:
       - uses: actions/checkout@v4
@@ -51,7 +50,6 @@ jobs:
               echo "Skipping pytest - only docs modified"
           fi
   test-macosx:
-    if: false
     name: OSX tests
     runs-on: macos-latest
     steps:

diff --git a/setup.cfg b/setup.cfg
@@ -10,7 +10,6 @@ parentdir_prefix = bioconda-utils-
 markers=
     long_running_1: mark as long-running test (may be executed separately)
     long_running_2: mark as long-running test (may be executed separately)
-    tmp: used for troubleshooting
     successive:
     asyncio:
 python_files = test/test_*py

diff --git a/test/test_utils.py b/test/test_utils.py
@@ -255,7 +255,6 @@ def test_single_build_with_post_test(single_build):
         pkg_test.test_package(pkg)
 
 
-@pytest.mark.tmp
 @pytest.mark.long_running_1
 def test_multi_build(multi_build):
     for v in multi_build.values():
@@ -264,7 +263,6 @@ def test_multi_build(multi_build):
             ensure_missing(pkg)
 
 
-@pytest.mark.tmp
 @pytest.mark.long_running_1
 def test_multi_build_exclude(multi_build_exclude):
     for (k, v) in multi_build_exclude.items():