[med-svn] [Git][med-team/conda][master] 2 commits: Add missing import

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / conda


Commits:
0771fcf0 by Andreas Tille at 2019-04-03T14:36:30Z
Add missing import

- - - - -
45ec5b3f by Andreas Tille at 2019-04-03T15:02:10Z
Exclude another test accessing remote locations

- - - - -


1 changed file:

- debian/patches/ignore_test_accessing_remote.patch


Changes:

=====================================
debian/patches/ignore_test_accessing_remote.patch
=====================================
@@ -78,11 +78,22 @@ Description: Ignore tests trying to remove remote network hosts
          index = get_index(platform=win64)
 --- a/tests/core/test_envs_manager.py
 +++ b/tests/core/test_envs_manager.py
-@@ -42,6 +42,7 @@ class EnvsManagerUnitTests(TestCase):
+@@ -42,6 +42,8 @@ class EnvsManagerUnitTests(TestCase):
          rm_rf(self.prefix)
          assert not lexists(self.prefix)
  
++    import pytest
 +    @pytest.mark.skipif(True, reason="Debian: seems to access network")
      def test_register_unregister_location_env(self):
          gascon_location = join(self.prefix, 'gascon')
          touch(join(gascon_location, PREFIX_MAGIC_FILE), mkdir=True)
+--- a/tests/core/test_repodata.py
++++ b/tests/core/test_repodata.py
+@@ -30,6 +30,7 @@ def platform_in_record(platform, record)
+ @pytest.mark.integration
+ class GetRepodataIntegrationTests(TestCase):
+ 
++    @pytest.mark.skipif(True, reason="Debian: seems to access network")
+     def test_get_index_no_platform_with_offline_cache(self):
+         import conda.core.subdir_data
+         with env_var('CONDA_REPODATA_TIMEOUT_SECS', '0', reset_context):



View it on GitLab: https://salsa.debian.org/med-team/conda/compare/8c7f1f82ade76240094e65a66fe11d52ef1cbce3...45ec5b3fb1b1c070b46f7d0cbce8a92f852ff636

-- 
View it on GitLab: https://salsa.debian.org/med-team/conda/compare/8c7f1f82ade76240094e65a66fe11d52ef1cbce3...45ec5b3fb1b1c070b46f7d0cbce8a92f852ff636
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/20190403/606c4e6d/attachment.html>