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',
t</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=f63f524053a9a8503bf98532b6b3d91b17c1d7c0'>refs</a><a class='active' href='/guix/log/gnu/packages/upnp.scm'>log</a><a href='/guix/tree/gnu/packages/upnp.scm?id=f63f524053a9a8503bf98532b6b3d91b17c1d7c0'>tree</a><a href='/guix/commit/gnu/packages/upnp.scm?id=f63f524053a9a8503bf98532b6b3d91b17c1d7c0'>commit</a><a href='/guix/diff/gnu/packages/upnp.scm?id=f63f524053a9a8503bf98532b6b3d91b17c1d7c0'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/upnp.scm'>
<input type='hidden' name='id' value='f63f524053a9a8503bf98532b6b3d91b17c1d7c0'/><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=f63f524053a9a8503bf98532b6b3d91b17c1d7c0'>root</a>/<a href='/guix/log/gnu?id=f63f524053a9a8503bf98532b6b3d91b17c1d7c0'>gnu</a>/<a href='/guix/log/gnu/packages?id=f63f524053a9a8503bf98532b6b3d91b17c1d7c0'>packages</a>/<a href='/guix/log/gnu/packages/upnp.scm?id=f63f524053a9a8503bf98532b6b3d91b17c1d7c0'>upnp.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/packages/upnp.scm?id=f63f524053a9a8503bf98532b6b3d91b17c1d7c0&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2021-01-06 09:37:02 +0200'>2021-01-06</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=6200fcabcf3491554e7ea5a2091eb86dbc0cfda6'>gnu: upnp.scm: Sort package module imports alphabetically.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/upnp.scm: Sort package module imports alphabetically.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-01-06 09:35:40 +0200'>2021-01-06</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=7dfc2d2e7f7ff5b0e8210ed7710f3cc87841d29c'>gnu: readymedia: Sort inputs alphabetically.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/upnp.scm (readymedia)[native-inputs]: Sort alphabetically.
[inputs]: Same.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-01-06 09:34:29 +0200'>2021-01-06</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=406008a2ac8b03317623a9967ec2e5fd3dca7650'>gnu: readymedia: Update to 1.3.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes CVE-2020-28926.

* gnu/packages/upnp.scm (readymedia): Update to 1.3.0.
[arguments]: Add configure-flag to not record kernel version of build
machine. Add phase to remove spurious substitution of ffmpeg libraries.
[inputs]: Add zlib.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-01-06 09:22:26 +0200'>2021-01-06</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=de194a39d3d49c7424d08e04b675ff649035e7b1'>gnu: upnp.scm: Use license prefix.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/upnp.scm: Use the 'license:' prefix to denote licences.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2021-01-06 09:20:19 +0200'>2021-01-06</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=91bc4f4dfbefabca103390fb3916090f7f6ce80f'>gnu: readymedia: Clean-up origin code.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/upnp.scm (readymedia)[source]: Replace custom logic with
string-replace-substring.
</span></span></td><td>Efraim Flashner</td></tr>
<tr><td><span title='2020-12-31 02:34:16 -0500'>2020-12-31</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=9606041dcb8509a1d62c9c80261178330cf60615'>gnu: libupnp: Update to 1.14.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/upnp.scm (libupnp): Update to 1.14.0.

Signed-off-by: Leo Famulari &lt;leo@famulari.name&gt;
</span></span></td><td>Vincent Legoll</td></tr>
<tr><td><span title='2020-05-13 00:57:15 +0200'>2020-05-13</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=60d758ec23297b7fcd7d4a8c94460e5735658acd'>gnu: libupnp: Do not build static libraries.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/upnp.scm (libupnp)[arguments]: Add "--disable-static" in
 #:configure-flags.  Also remove "--enable-ipv6" as it is the default.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-05-13 00:57:15 +0200'>2020-05-13</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=47986cc8e95a1c0ed69ded62d6aeca1e82068cd6'>gnu: libupnp: Update to 1.12.1.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/upnp.scm (libupnp): Update to 1.12.1.
[source]: Change to URL-FETCH with bootstrapped tarball.
[native-inputs]: Remove AUTOCONF, AUTOMAKE, and LIBTOOL.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-05-02 17:31:28 +0200'>2020-05-02</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=50e6c1bf2ef2f006baa8cac80dfbb12ca2ba6d64'>Merge branch 'master' into core-updates</a></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-05-02 12:04:57 +0200'>2020-05-02</span></td><td><a href='/guix/commit/gnu/packages/upnp.scm?id=1d2366202ad115cc7c48ac15c83ef994a2d8304c'>gnu: libupnp: Update to 1.8.6.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/upnp.scm (libupnp): Update to 1.8.6.
[source]: Use git-fetch on the new official repository.
[native-inputs]: Add autoconf, automake, libtool and pkg-config.

Signed-off-by: Mathieu Othacehe &lt;m.othacehe@gmail.com&gt;
</span></span></td><td>Jan Wielkiewicz</td></tr>