[med-svn] [Git][med-team/conda][master] Adapt patch

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / conda


Commits:
2f5980ea by Andreas Tille at 2020-04-19T12:25:39+02:00
Adapt patch

- - - - -


1 changed file:

- debian/patches/fix_other_test_issues.patch


Changes:

=====================================
debian/patches/fix_other_test_issues.patch
=====================================
@@ -2,10 +2,8 @@ Author: Andreas Tille <tille at debian.org>
 Last-Update: Sun, 10 Mar 2019 09:33:50 +0100
 Description: Other random fixes in test suite
 
-Index: conda/tests/core/test_initialize.py
-===================================================================
---- conda.orig/tests/core/test_initialize.py
-+++ conda/tests/core/test_initialize.py
+--- a/tests/core/test_initialize.py
++++ b/tests/core/test_initialize.py
 @@ -26,6 +26,7 @@ from conda.exceptions import CondaValueE
  from conda.gateways.disk.create import create_link, mkdir_p
  from conda.models.enums import LinkType
@@ -39,10 +37,8 @@ Index: conda/tests/core/test_initialize.py
      @pytest.mark.skipif(on_win, reason="unix-only test")
      def test_init_sh_user_unix(self):
          with tempdir() as conda_temp_prefix:
-Index: conda/tests/test_activate.py
-===================================================================
---- conda.orig/tests/test_activate.py
-+++ conda/tests/test_activate.py
+--- a/tests/test_activate.py
++++ b/tests/test_activate.py
 @@ -2157,6 +2157,7 @@ class ShellWrapperIntegrationTests(TestC
          assert 'venusaur' not in PATH3
          assert len(PATH0.split(':')) + num_paths_added * 2 == len(PATH3.split(':'))
@@ -51,55 +47,3 @@ Index: conda/tests/test_activate.py
      @pytest.mark.skipif(bash_unsupported(), reason=bash_unsupported_because())
      def test_bash_basic_integration(self):
          with InteractiveShell('bash') as shell:
---- a/tests/core/test_package_cache_data.py
-+++ b/tests/core/test_package_cache_data.py
-@@ -16,7 +16,7 @@ from conda.gateways.disk.create import c
- from conda.gateways.disk.permissions import make_read_only
- from conda.gateways.disk.read import isfile, listdir, yield_lines
- from conda.models.records import PackageRecord
--from tests.test_create import make_temp_package_cache
-+#from tests.test_create import make_temp_package_cache
- 
- CHANNEL_DIR = abspath(join(dirname(__file__), '..', 'data', 'conda_format_repo'))
- CONDA_PKG_REPO = url_path(CHANNEL_DIR)
-@@ -79,7 +79,7 @@ def test_ProgressiveFetchExtract_prefers
-     assert cache_action.target_package_basename.endswith('.conda')
-     assert extract_action.source_full_path.endswith('.conda')
- 
--
-+ at pytest.mark.skipif(True, reason="Debian: At package build time the python module providing make_temp_package_cache is excluded so skip this test")
- def test_tar_bz2_in_pkg_cache_used_instead_of_conda_pkg():
-     """
-     Test that if a .tar.bz2 package is downloaded and extracted in a package cache, the
-@@ -120,6 +120,7 @@ def test_tar_bz2_in_pkg_cache_used_inste
-         assert urls_text[0] == zlib_tar_bz2_prec.url
- 
- 
-+ at pytest.mark.skipif(True, reason="Debian: At package build time the python module providing make_temp_package_cache is excluded so skip this test")
- @pytest.mark.integration
- def test_tar_bz2_in_pkg_cache_doesnt_overwrite_conda_pkg():
-     """
-@@ -176,6 +177,7 @@ def test_tar_bz2_in_pkg_cache_doesnt_ove
-             assert urls_text[1] == zlib_conda_prec.url
- 
- 
-+ at pytest.mark.skipif(True, reason="Debian: At package build time the python module providing make_temp_package_cache is excluded so skip this test")
- @pytest.mark.integration
- def test_conda_pkg_in_pkg_cache_doesnt_overwrite_tar_bz2():
-     """
-@@ -276,6 +278,7 @@ def test_tar_bz2_in_cache_not_extracted(
-         assert len(pfe.extract_actions) == 0
- 
- 
-+ at pytest.mark.skipif(True, reason="Debian: At package build time the python module providing make_temp_package_cache is excluded so skip this test")
- def test_instantiating_package_cache_when_both_tar_bz2_and_conda_exist():
-     """
-     If both .tar.bz2 and .conda packages exist in a writable package cache, but neither is
-@@ -321,6 +324,7 @@ def test_instantiating_package_cache_whe
-         assert zlib_conda_fn in pkgs_dir_files
- 
- 
-+ at pytest.mark.skipif(True, reason="Debian: At package build time the python module providing make_temp_package_cache is excluded so skip this test")
- def test_instantiating_package_cache_when_both_tar_bz2_and_conda_exist_read_only():
-     """
-     If both .tar.bz2 and .conda packages exist in a read-only package cache, but neither is



View it on GitLab: https://salsa.debian.org/med-team/conda/-/commit/2f5980ea7ec046fadf91c7b830df660bfb7803a4

-- 
View it on GitLab: https://salsa.debian.org/med-team/conda/-/commit/2f5980ea7ec046fadf91c7b830df660bfb7803a4
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200419/4125f0ba/attachment-0001.html>