[gvfs/wip/oholy/python3-twisted] test: Port to python-twisted
- From: Ondrej Holy <oholy src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gvfs/wip/oholy/python3-twisted] test: Port to python-twisted
- Date: Tue, 29 Oct 2019 11:16:12 +0000 (UTC)
commit e4b39b1b51db2b09bec6b231b0009a3d5b343699
Author: Ondrej Holy <oholy redhat com>
Date: Tue Oct 29 11:47:01 2019 +0100
test: Port to python-twisted
Test suite were ported to python3, however, twistd binary is still required
for ftp test cases. The twistd binary is part of python2-twisted, which is
going to be retired. Let's use python3 version instead. It seems that Fedora
has twistd-3 binary, whereas, Debian has twistd3, so try to look for both of
them. The test cases seem working nicely with it as per my testing.
Fixes: https://gitlab.gnome.org/GNOME/gvfs/issues/428
test/gvfs-test | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/test/gvfs-test b/test/gvfs-test
index 73b4e2fb..2c37deeb 100755
--- a/test/gvfs-test
+++ b/test/gvfs-test
@@ -52,7 +52,6 @@ except (ValueError, ImportError):
# umockdev environment for gphoto/MTP tests
umockdev_testbed = None
-twistd_path = shutil.which('twistd')
smbd_path = shutil.which('smbd')
def find_alternative(cmds):
@@ -67,6 +66,7 @@ samba_running = subprocess.call(['pidof', 'smbd'], stdout=subprocess.PIPE) == 0
httpd_cmd = find_alternative(['apache2', 'httpd', 'apachectl'])
have_httpd = httpd_cmd is not None
sshd_path = shutil.which('sshd')
+twistd_path = find_alternative(['twistd-3', 'twistd3'])
local_ip = subprocess.check_output("ip -4 addr | sed -nr '/127\.0\.0/ n; "
"/inet / { s/^.*inet ([0-9.]+).*$/\\1/; p; q }'"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]