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/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=e9cfcb8d36f14df87b49b857f4516f6d0b520410'>refs</a><a class='active' href='/guix/log/gnu/services/security-token.scm'>log</a><a href='/guix/tree/gnu/services/security-token.scm?id=e9cfcb8d36f14df87b49b857f4516f6d0b520410'>tree</a><a href='/guix/commit/gnu/services/security-token.scm?id=e9cfcb8d36f14df87b49b857f4516f6d0b520410'>commit</a><a href='/guix/diff/gnu/services/security-token.scm?id=e9cfcb8d36f14df87b49b857f4516f6d0b520410'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/security-token.scm'>
<input type='hidden' name='id' value='e9cfcb8d36f14df87b49b857f4516f6d0b520410'/><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=e9cfcb8d36f14df87b49b857f4516f6d0b520410'>root</a>/<a href='/guix/log/gnu?id=e9cfcb8d36f14df87b49b857f4516f6d0b520410'>gnu</a>/<a href='/guix/log/gnu/services?id=e9cfcb8d36f14df87b49b857f4516f6d0b520410'>services</a>/<a href='/guix/log/gnu/services/security-token.scm?id=e9cfcb8d36f14df87b49b857f4516f6d0b520410'>security-token.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/services/security-token.scm?id=e9cfcb8d36f14df87b49b857f4516f6d0b520410&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-12-22 00:31:41 +0100'>2023-12-22</span></td><td><a href='/guix/commit/gnu/services/security-token.scm?id=3d6583727ec90732ad7bd97808fd4fca8f6d8bdc'>services: Remove unnecessary references to (gnu build shepherd).</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/databases.scm (memcached-shepherd-service): Remove
‘with-imported-modules’ form and ‘modules’ field.
* gnu/services/security-token.scm (pcscd-shepherd-service): Remove
‘with-imported-modules’ form.
* gnu/services/web.scm (hpcguix-web-shepherd-service): Likewise.

Change-Id: Ieb817508f1751e0c1ff551a0e078789a4a813c1c
</span></span></td><td>Ludovic Courtès</td></tr>