[Debian-astro-commits] [python-astropy] 05/05: Disable a QTable test (#6308)

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch master
in repository python-astropy.

commit bd2087f0560a3b5997726e437f8a677c394ce988
Author: Ole Streicher <olebole at debian.org>
Date:   Sun Jul 2 14:52:12 2017 +0200

    Disable a QTable test (#6308)
---
 debian/patches/mark_known_failures.patch | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/debian/patches/mark_known_failures.patch b/debian/patches/mark_known_failures.patch
index 3a2bc20..c96c91f 100644
--- a/debian/patches/mark_known_failures.patch
+++ b/debian/patches/mark_known_failures.patch
@@ -6,9 +6,10 @@ Subject: Mark all known test failures as xfail. These failures have been
 ---
  astropy/samp/tests/test_standard_profile.py                           | 2 ++
  astropy/table/tests/test_info.py                                      | 3 ++-
+ astropy/table/tests/test_operations.py                                | 2 ++
  astropy/tests/tests/test_socketblocker.py                             | 4 ++--
  astropy/visualization/wcsaxes/tests/test_display_world_coordinates.py | 4 ++++
- 4 files changed, 10 insertions(+), 3 deletions(-)
+ 5 files changed, 12 insertions(+), 3 deletions(-)
 
 diff --git a/astropy/samp/tests/test_standard_profile.py b/astropy/samp/tests/test_standard_profile.py
 index 632db07..7e92aab 100644
@@ -37,6 +38,19 @@ index 0b46014..b14afba 100644
  def test_ignore_warnings():
      t = table.Table([[np.nan, np.nan]])
      with warnings.catch_warnings(record=True) as warns:
+diff --git a/astropy/table/tests/test_operations.py b/astropy/table/tests/test_operations.py
+index 0086dc4..65c5247 100644
+--- a/astropy/table/tests/test_operations.py
++++ b/astropy/table/tests/test_operations.py
+@@ -629,6 +629,8 @@ class TestVStack():
+                                                     '0.0 foo',
+                                                     '1.0  --']
+ 
++    # see https://github.com/astropy/astropy/issues/6291
++    @pytest.mark.xfail()
+     def test_col_meta_merge_inner(self, operation_table_type):
+         self._setup(operation_table_type)
+         t1 = self.t1
 diff --git a/astropy/tests/tests/test_socketblocker.py b/astropy/tests/tests/test_socketblocker.py
 index 18524b6..bcc5aea 100644
 --- a/astropy/tests/tests/test_socketblocker.py

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/python-astropy.git