[med-svn] [Git][med-team/intake][master] 2 commits: Ignore test that fails when more than one Python3 versions are installed

[Andreas Tille]

Andreas Tille pushed to branch master at Debian Med / intake


Commits:
91e167f2 by Andreas Tille at 2020-11-16T10:53:53+01:00
Ignore test that fails when more than one Python3 versions are installed

- - - - -
2695f64b by Andreas Tille at 2020-11-16T10:57:00+01:00
Upload to unstable

- - - - -


2 changed files:

- debian/changelog
- debian/patches/fix_tests.patch


Changes:

=====================================
debian/changelog
=====================================
@@ -1,13 +1,18 @@
-intake (0.6.0-4) UNRELEASED; urgency=medium
+intake (0.6.0-4) unstable; urgency=medium
+
+  * Team upload
 
   [ Shayan Doust ]
   * Add some missing build dependencies
-  * Fix tests to an extent and address bug #971177
+  * Fix some tests 
+  * Fix sphinx issue (Closes: #971177)
 
   [ Andreas Tille ]
   * Build-Depends: python3-tqdm
+  * Ignore test that fails when more than one Python3 versions are
+    installed
 
- -- Andreas Tille <tille at debian.org>  Mon, 16 Nov 2020 08:52:34 +0100
+ -- Andreas Tille <tille at debian.org>  Mon, 16 Nov 2020 10:54:06 +0100
 
 intake (0.6.0-3) unstable; urgency=medium
 


=====================================
debian/patches/fix_tests.patch
=====================================
@@ -3,10 +3,8 @@ Description: fix failing tests
 Author: Shayan Doust <hello at shayandoust.me>
 Last-Update: 2020-06-20
 ---
-Index: intake/intake/conftest.py
-===================================================================
---- intake.orig/intake/conftest.py
-+++ intake/intake/conftest.py
+--- a/intake/conftest.py
++++ b/intake/conftest.py
 @@ -144,7 +144,7 @@ def http_server():
      if PY2:
          cmd = ['python', '-m', 'SimpleHTTPServer', port_as_str]
@@ -16,23 +14,24 @@ Index: intake/intake/conftest.py
      p = subprocess.Popen(cmd, cwd=os.path.join(here, 'catalog', 'tests'))
      url = 'http://localhost:{}/'.format(port_as_str)
      timeout = 5
-Index: intake/intake/catalog/tests/test_default.py
-===================================================================
---- intake.orig/intake/catalog/tests/test_default.py
-+++ intake/intake/catalog/tests/test_default.py
-@@ -12,7 +12,7 @@ from intake.catalog.base import Catalog
+--- a/intake/catalog/tests/test_default.py
++++ b/intake/catalog/tests/test_default.py
+@@ -11,9 +11,10 @@ from intake.catalog import default
+ from intake.catalog.base import Catalog
  
  
- def test_which():
+-def test_which():
 -    p = default.which('python')
-+    p = default.which('python3')
-     assert Path(p).resolve() == Path(sys.executable).resolve()
+-    assert Path(p).resolve() == Path(sys.executable).resolve()
++# This test fails when two Python3 versions are used in parallel on Debian
++#def test_which():
++#    p = default.which('python3')
++#    assert Path(p).resolve() == Path(sys.executable).resolve()
  
  
-Index: intake/intake/container/tests/test_persist.py
-===================================================================
---- intake.orig/intake/container/tests/test_persist.py
-+++ intake/intake/container/tests/test_persist.py
+ def test_load():
+--- a/intake/container/tests/test_persist.py
++++ b/intake/container/tests/test_persist.py
 @@ -41,9 +41,9 @@ def test_store(temp_cache):
  
  def test_backtrack(temp_cache):
@@ -46,10 +45,8 @@ Index: intake/intake/container/tests/test_persist.py
  
  
  def test_persist_with_nonnumeric_ttl_raises_error(temp_cache):
-Index: intake/intake/source/tests/test_discovery.py
-===================================================================
---- intake.orig/intake/source/tests/test_discovery.py
-+++ intake/intake/source/tests/test_discovery.py
+--- a/intake/source/tests/test_discovery.py
++++ b/intake/source/tests/test_discovery.py
 @@ -46,22 +46,22 @@ def test_discover_cli(extra_pythonpath,
      env["INTAKE_CONF_FILE"] = tmp_config_path
      env['PYTHONPATH'] = extra_pythonpath
@@ -89,10 +86,8 @@ Index: intake/intake/source/tests/test_discovery.py
  
  
  def test_discover(extra_pythonpath, tmp_config_path):
-Index: intake/intake/cli/server/tests/test_server.py
-===================================================================
---- intake.orig/intake/cli/server/tests/test_server.py
-+++ intake/intake/cli/server/tests/test_server.py
+--- a/intake/cli/server/tests/test_server.py
++++ b/intake/cli/server/tests/test_server.py
 @@ -323,6 +323,6 @@ def address_server(tmpdir):
      shutil.rmtree(tmpdir)
  
@@ -103,10 +98,8 @@ Index: intake/intake/cli/server/tests/test_server.py
 +#def test_address_flag(address_server):
 +#    cat = open_catalog(address_server)
 +#    assert 'use_example1' in list(cat)
-Index: intake/intake/source/tests/test_npy.py
-===================================================================
---- intake.orig/intake/source/tests/test_npy.py
-+++ intake/intake/source/tests/test_npy.py
+--- a/intake/source/tests/test_npy.py
++++ b/intake/source/tests/test_npy.py
 @@ -10,7 +10,7 @@ import numpy as np
  import posixpath
  import pytest



View it on GitLab: https://salsa.debian.org/med-team/intake/-/compare/eea5eabe58051bf5e76360628ee1064a593c01f4...2695f64bed50560c4b42aa88056d71a19c753525

-- 
View it on GitLab: https://salsa.debian.org/med-team/intake/-/compare/eea5eabe58051bf5e76360628ee1064a593c01f4...2695f64bed50560c4b42aa88056d71a19c753525
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/20201116/dfff6b47/attachment-0001.html>