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',
</tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=d7942ac12ad51615cd43d3debb8b561a503e8fc0'>refs</a><a class='active' href='/guix/log/gnu/packages/patches/ecl-16-format-directive-limit.patch'>log</a><a href='/guix/tree/gnu/packages/patches/ecl-16-format-directive-limit.patch?id=d7942ac12ad51615cd43d3debb8b561a503e8fc0'>tree</a><a href='/guix/commit/gnu/packages/patches/ecl-16-format-directive-limit.patch?id=d7942ac12ad51615cd43d3debb8b561a503e8fc0'>commit</a><a href='/guix/diff/gnu/packages/patches/ecl-16-format-directive-limit.patch?id=d7942ac12ad51615cd43d3debb8b561a503e8fc0'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/patches/ecl-16-format-directive-limit.patch'>
<input type='hidden' name='id' value='d7942ac12ad51615cd43d3debb8b561a503e8fc0'/><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=d7942ac12ad51615cd43d3debb8b561a503e8fc0'>root</a>/<a href='/guix/log/gnu?id=d7942ac12ad51615cd43d3debb8b561a503e8fc0'>gnu</a>/<a href='/guix/log/gnu/packages?id=d7942ac12ad51615cd43d3debb8b561a503e8fc0'>packages</a>/<a href='/guix/log/gnu/packages/patches?id=d7942ac12ad51615cd43d3debb8b561a503e8fc0'>patches</a>/<a href='/guix/log/gnu/packages/patches/ecl-16-format-directive-limit.patch?id=d7942ac12ad51615cd43d3debb8b561a503e8fc0'>ecl-16-format-directive-limit.patch</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/gnu/packages/patches/ecl-16-format-directive-limit.patch?id=d7942ac12ad51615cd43d3debb8b561a503e8fc0&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-07-10 23:03:41 +0200'>2020-07-10</span></td><td><a href='/guix/commit/gnu/packages/patches/ecl-16-format-directive-limit.patch?id=5b9822cf43f0e568fc42a0a60a7ed4d77e5e9832'>gnu: Add ECL 16.1.3 for Sage.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/sagemath.scm (ecl-16): New variable.
* gnu/packages/patches/ecl-16-format-directive-limit.patch,
  gnu/packages/patches/ecl-16-ignore-stderr-write-error.patch,
  gnu/packages/patches/ecl-16-libffi.patch: New files.
* gnu/local.mk (dist_patch_DATA): Register the patches.
</span></span></td><td>Jakub Kądziołka</td></tr>