all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
blob 575c8abbb744045ee27c36de7f4fe7b2508059df 1195 bytes (raw)
name: gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch 	 # note: path name is non-authoritative(*)

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
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',

debug log:

solving 575c8abbb7 ...
found 575c8abbb7 in https://yhetil.org/guix/20200519073209.GA3485@zpidnp36/

applying [1/1] https://yhetil.org/guix/20200519073209.GA3485@zpidnp36/
diff --git a/gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch b/gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch
new file mode 100644
index 0000000000..575c8abbb7

1:21: trailing whitespace.
 
1:26: trailing whitespace.
 
1:27: trailing whitespace.
 
1:39: trailing whitespace.
 
Checking patch gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch...
Applied patch gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch cleanly.
warning: 4 lines add whitespace errors.

index at:
100644 575c8abbb744045ee27c36de7f4fe7b2508059df	gnu/packages/patches/python-argcomplete-1.11.1-fish31.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.