forked from pool/python-argcomplete
Accepting request 788468 from home:alarrosa:branches:devel:languages:python
- Add patch from upstream to fix tests with latest fish version: * 0001-Remove-expected-test-failure-for-new-versions-of-fish.patch OBS-URL: https://build.opensuse.org/request/show/788468 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-argcomplete?expand=0&rev=29
This commit is contained in:
committed by
Git OBS Bridge
parent
83fd5d91bd
commit
a992b9c6ae
@@ -0,0 +1,35 @@
|
||||
From 08bfc8a788e8081515d733e67be026d051c726f7 Mon Sep 17 00:00:00 2001
|
||||
From: Evan <evanunderscore@gmail.com>
|
||||
Date: Thu, 19 Mar 2020 14:55:07 +1100
|
||||
Subject: [PATCH] Remove expected test failure for new versions of fish (#292)
|
||||
|
||||
---
|
||||
test/test.py | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/test.py b/test/test.py
|
||||
index e91352b..2c34806 100755
|
||||
--- a/test/test.py
|
||||
+++ b/test/test.py
|
||||
@@ -28,6 +28,8 @@
|
||||
|
||||
BASH_VERSION = subprocess.check_output(['bash', '-c', 'echo $BASH_VERSION']).decode()
|
||||
BASH_MAJOR_VERSION = int(BASH_VERSION.split('.')[0])
|
||||
+FISH_VERSION_STR = subprocess.check_output(['fish', '-c', 'echo -n $FISH_VERSION']).decode()
|
||||
+FISH_VERSION_TUPLE = tuple(int(x) for x in FISH_VERSION_STR.split('.'))
|
||||
|
||||
|
||||
class TempDir(object):
|
||||
@@ -1258,8 +1260,11 @@ class TestFish(_TestSh, unittest.TestCase):
|
||||
expected_failures = [
|
||||
'test_parse_special_characters',
|
||||
'test_comp_point',
|
||||
- 'test_special_characters_double_quoted'
|
||||
]
|
||||
+ if FISH_VERSION_TUPLE < (3, 1):
|
||||
+ expected_failures.extend([
|
||||
+ 'test_special_characters_double_quoted'
|
||||
+ ])
|
||||
|
||||
skipped = [
|
||||
'test_single_quotes_in_single_quotes',
|
||||
@@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 26 09:44:38 UTC 2020 - Antonio Larrosa <alarrosa@suse.com>
|
||||
|
||||
- Add patch from upstream to fix tests with latest fish version:
|
||||
* 0001-Remove-expected-test-failure-for-new-versions-of-fish.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 17 10:42:58 UTC 2020 - Marketa Calabkova <mcalabkova@suse.com>
|
||||
|
||||
|
||||
@@ -28,6 +28,7 @@ URL: https://github.com/kislyuk/argcomplete
|
||||
Source: https://files.pythonhosted.org/packages/source/a/argcomplete/argcomplete-%{version}.tar.gz
|
||||
Patch0: skip_tcsh_tests.patch
|
||||
Patch1: trim-test-deps.patch
|
||||
Patch2: 0001-Remove-expected-test-failure-for-new-versions-of-fish.patch
|
||||
BuildRequires: %{python_module importlib-metadata}
|
||||
BuildRequires: %{python_module pexpect}
|
||||
BuildRequires: %{python_module pip}
|
||||
@@ -56,6 +57,7 @@ resources over the network).
|
||||
%setup -q -n argcomplete-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
|
||||
%build
|
||||
%python_build
|
||||
|
||||
Reference in New Issue
Block a user