Merging upstream version 2.16.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 6 insertions, 10 deletions

diff --git a/tests/repository_test.py b/tests/repository_test.py
index 4121fed..36268e1 100644
--- a/tests/repository_test.py
+++ b/tests/repository_test.py
@@ -111,8 +111,8 @@ def test_local_conda_additional_dependencies(store):
             'name': 'local-conda',
             'entry': 'python',
             'language': 'conda',
-            'args': ['-c', 'import tzdata; print("OK")'],
-            'additional_dependencies': ['python-tzdata'],
+            'args': ['-c', 'import botocore; print("OK")'],
+            'additional_dependencies': ['botocore'],
         }],
     }
     hook = _get_hook(config, store, 'local-conda')
@@ -164,7 +164,7 @@ def test_python_hook_weird_setup_cfg(in_git_dir, tempdir_factory, store):
     )
 
 
-def test_python_venv(tempdir_factory, store):  # pragma: no cover (no venv)
+def test_python_venv(tempdir_factory, store):
     _test_hook_repo(
         tempdir_factory, store, 'python_venv_hooks_repo',
         'foo', [os.devnull],
@@ -245,7 +245,6 @@ def test_run_a_docker_image_hook(tempdir_factory, store, hook_id):
     )
 
 
-@xfailif_windows  # pragma: win32 no cover
 def test_run_a_node_hook(tempdir_factory, store):
     _test_hook_repo(
         tempdir_factory, store, 'node_hooks_repo',
@@ -253,7 +252,6 @@ def test_run_a_node_hook(tempdir_factory, store):
     )
 
 
-@xfailif_windows  # pragma: win32 no cover
 def test_run_a_node_hook_default_version(tempdir_factory, store):
     # make sure that this continues to work for platforms where node is not
     # installed at the system
@@ -263,7 +261,6 @@ def test_run_a_node_hook_default_version(tempdir_factory, store):
         test_run_a_node_hook(tempdir_factory, store)
 
 
-@xfailif_windows  # pragma: win32 no cover
 def test_run_versioned_node_hook(tempdir_factory, store):
     _test_hook_repo(
         tempdir_factory, store, 'node_versioned_hooks_repo',
@@ -271,7 +268,6 @@ def test_run_versioned_node_hook(tempdir_factory, store):
     )
 
 
-@xfailif_windows  # pragma: win32 no cover
 def test_node_hook_with_npm_userconfig_set(tempdir_factory, store, tmpdir):
     cfg = tmpdir.join('cfg')
     cfg.write('cache=/dne\n')
@@ -653,7 +649,6 @@ def test_additional_ruby_dependencies_installed(tempdir_factory, store):
         assert 'tins' in output
 
 
-@xfailif_windows  # pragma: win32 no cover
 def test_additional_node_dependencies_installed(tempdir_factory, store):
     path = make_repo(tempdir_factory, 'node_hooks_repo')
     config = make_config_from_repo(path)
@@ -1007,6 +1002,7 @@ def test_manifest_hooks(tempdir_factory, store):
         types=['file'],
         types_or=[],
         verbose=False,
+        fail_fast=False,
     )
 
 
@@ -1025,13 +1021,13 @@ def test_local_perl_additional_dependencies(store):
             'name': 'hello',
             'entry': 'perltidy --version',
             'language': 'perl',
-            'additional_dependencies': ['SHANCOCK/Perl-Tidy-20200110.tar.gz'],
+            'additional_dependencies': ['SHANCOCK/Perl-Tidy-20211029.tar.gz'],
         }],
     }
     hook = _get_hook(config, store, 'hello')
     ret, out = _hook_run(hook, (), color=False)
     assert ret == 0
-    assert _norm_out(out).startswith(b'This is perltidy, v20200110')
+    assert _norm_out(out).startswith(b'This is perltidy, v20211029')
 
 
 @pytest.mark.parametrize(