Upstream commit fixing testcases for fish>=3.1, see
https://github.com/kislyuk/argcomplete/commit/08bfc8a788e8081515d733e67be026d051c726f7

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',
ef='/guix/'>summary</a><a href='/guix/refs/?id=99adfd7d3dab9ad17163b2012f1ae1ffc174ff7d'>refs</a><a class='active' href='/guix/log/tests/grafts.scm'>log</a><a href='/guix/tree/tests/grafts.scm?id=99adfd7d3dab9ad17163b2012f1ae1ffc174ff7d'>tree</a><a href='/guix/commit/tests/grafts.scm?id=99adfd7d3dab9ad17163b2012f1ae1ffc174ff7d'>commit</a><a href='/guix/diff/tests/grafts.scm?id=99adfd7d3dab9ad17163b2012f1ae1ffc174ff7d'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/grafts.scm'>
<input type='hidden' name='id' value='99adfd7d3dab9ad17163b2012f1ae1ffc174ff7d'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=99adfd7d3dab9ad17163b2012f1ae1ffc174ff7d'>root</a>/<a href='/guix/log/tests?id=99adfd7d3dab9ad17163b2012f1ae1ffc174ff7d'>tests</a>/<a href='/guix/log/tests/grafts.scm?id=99adfd7d3dab9ad17163b2012f1ae1ffc174ff7d'>grafts.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/grafts.scm?id=99adfd7d3dab9ad17163b2012f1ae1ffc174ff7d&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-08-24 23:55:51 +0200'>2017-08-24</span></td><td><a href='/guix/commit/tests/grafts.scm?id=94e86a6b67c7a02f5f11358743f3b9f11997059c'>graft: Correctly replace references near the end of the scan buffer.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;http://bugs.gnu.org/28212&gt;.
Reported by Leo Famulari &lt;leo@famulari.name&gt;.

* guix/build/graft.scm (replace-store-references): When I &gt;= END, check
whether WRITTEN &gt; END and call 'get-bytevector-n!' when it is.
* tests/grafts.scm (buffer-size): New variable.
("replace-store-references, &lt;http://bugs.gnu.org/28212&gt;"): New test.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2017-01-25 11:04:25 +0100'>2017-01-25</span></td><td><a href='/guix/commit/tests/grafts.scm?id=482fda2729c3e76999892cb8f9a0391a7bd37119'>grafts: Do not pull derivation outputs not depended on.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes &lt;http://bugs.gnu.org/24886&gt;.

Previously, the grafting derivation of, say, brdf-explorer would pull in
qt:doc even though brdf-explorer depends only on qt:out, not qt:doc.

* guix/grafts.scm (with-cache): Use 'vhash-assoc' and 'vhash-cons'
instead of 'vhash-assq' and 'vhash-consq'.
(cumulative-grafts): Pass #:outputs to 'graft-derivation/shallow'.  Use
OUTPUTS instead of (derivation-output-names drv).
(graft-derivation): Add #:outputs parameter; pass it to
'cumulative-grafts'.
* tests/grafts.scm (make-derivation-input): New variable.
("graft-derivation, replaced derivation has multiple outputs"): Make
sure P2:zzz is not part of the outputs of P3D.
("graft-derivation with #:outputs")
("graft-derivation, unused outputs not depended on"): New tests.
</span></span></td><td>Ludovic Courtès</td></tr>