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',
='/guix/'>summary</a><a href='/guix/refs/?id=07caffbfbd8c5a50bca02e13d067aeb313e7363a'>refs</a><a class='active' href='/guix/log/gnu/artwork.scm'>log</a><a href='/guix/tree/gnu/artwork.scm?id=07caffbfbd8c5a50bca02e13d067aeb313e7363a'>tree</a><a href='/guix/commit/gnu/artwork.scm?id=07caffbfbd8c5a50bca02e13d067aeb313e7363a'>commit</a><a href='/guix/diff/gnu/artwork.scm?id=07caffbfbd8c5a50bca02e13d067aeb313e7363a'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/artwork.scm'>
<input type='hidden' name='id' value='07caffbfbd8c5a50bca02e13d067aeb313e7363a'/><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=07caffbfbd8c5a50bca02e13d067aeb313e7363a'>root</a>/<a href='/guix/log/gnu?id=07caffbfbd8c5a50bca02e13d067aeb313e7363a'>gnu</a>/<a href='/guix/log/gnu/artwork.scm?id=07caffbfbd8c5a50bca02e13d067aeb313e7363a'>artwork.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/gnu/artwork.scm?id=07caffbfbd8c5a50bca02e13d067aeb313e7363a&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>