Submitted upstream: https://github.com/ibus/ibus-anthy/pull/35

diff --git a/tests/test-build.sh b/tests/test-build.sh
index e83b78f..bbfa7e1 100755
--- a/tests/test-build.sh
+++ b/tests/test-build.sh
@@ -63,26 +63,33 @@ parse_args()
     done;
 }
 
+maybe_install_pycotap() {
+    # Red Hat specific hint.
+    if test -f /etc/redhat-release ; then
+        if ! rpm -q --quiet python3-pycotap; then
+            echo "Please install python3-pycotap"
+            exit -1
+        fi
+    fi;
+
+    # Check if pycotap is already available.
+    if ! python3 -m pycotap >/dev/null; then
+        echo "pycotap not found; installing via pip"
+        if ! pip install pycotap --user; then
+            echo "failed to install pycotap"
+            exit -1
+        fi
+    fi
+}
+
 init_environment()
 {
     if test x$FORCE_TEST != x ; then
         RUN_ARGS="$RUN_ARGS --force";
     fi;
-    HAS_TAP=0;
-    if test -f /etc/redhat-release ; then
-        rpm -q --quiet python3-pycotap
-        if test $? -ne 0 ; then
-            echo "Not found python3-pycotap";
-            exit -1;
-	fi;
-        HAS_TAP=1;
-    fi;
-    TAP_DIR=`python -m site --user-site`/pycotap;
-    if test $HAS_TAP -ne 1 && \
-       test x"$TAP_DIR" != x && test ! -d "$TAP_DIR" ; then
-            echo "pip install pycotap --user";
-            pip install pycotap --user;
-    fi;
+
+    maybe_install_pycotap
+
     if test ! -f $BUILDDIR/../data/$ANTHY_SCHEMA_FILE ; then
         echo "Not found $BUILDDIR/../data/$ANTHY_SCHEMA_FILE";
         exit -1;
orm class='right' method='get' action='/guix/log/gnu/services/spice.scm'>
<input type='hidden' name='id' value='4a0ffae5900bb542017f244c11b7874612714360'/><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=4a0ffae5900bb542017f244c11b7874612714360'>root</a>/<a href='/guix/log/gnu?id=4a0ffae5900bb542017f244c11b7874612714360'>gnu</a>/<a href='/guix/log/gnu/services?id=4a0ffae5900bb542017f244c11b7874612714360'>services</a>/<a href='/guix/log/gnu/services/spice.scm?id=4a0ffae5900bb542017f244c11b7874612714360'>spice.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/spice.scm?id=4a0ffae5900bb542017f244c11b7874612714360&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-01-25 14:05:37 +0100'>2017-01-25</span></td><td><a href='/guix/commit/gnu/services/spice.scm?id=e57bd0bed86caac304e5f37c5653e6b13858c7c5'>services: Fix 'mkdir-p' in activation scripts.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/cups.scm (%cups-activation): Import (guix build utils).
* gnu/services/mail.scm (opensmtpd-activation): Idem.
* gnu/services/networking.scm (ntp-service-activation): Idem.
* gnu/services/spice.scm (spice-vdagent-activation): Idem.
* gnu/services/ssh.scm (openssh-activation): Idem.
  (dropbear-activation): Idem.
* gnu/services/vpn.scm (%openvpn-activation): Idem.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Clément Lassieur</td></tr>
<tr><td><span title='2016-09-10 13:10:06 +0200'>2016-09-10</span></td><td><a href='/guix/commit/gnu/services/spice.scm?id=9e41130b14ad32c4e1fa756f95d806703056cb60'>system: Use 'file-append' to denote file names.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/avahi.scm, gnu/services/base.scm,
gnu/services/databases.scm, gnu/services/dbus.scm,
gnu/services/desktop.scm, gnu/services/dict.scm,
gnu/services/mail.scm, gnu/services/networking.scm,
gnu/services/sddm.scm, gnu/services/spice.scm,
gnu/services/ssh.scm, gnu/services/web.scm,
gnu/services/xorg.scm, gnu/system.scm: Replace the
 #~(string-append #$pkg "/bin/foo") idiom with
 (file-append pkg "/bin/foo").
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2016-08-05 21:48:43 +0200'>2016-08-05</span></td><td><a href='/guix/commit/gnu/services/spice.scm?id=00f469056893ae80fecefee44e09d6904b613de4'>services: Add spice vdagent service.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/spice.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
* doc/guix.texi (Various Services): New subheading.
</span></span></td><td>David Craven</td></tr>