Commit e4b39b1b authored by Ondrej Holy's avatar Ondrej Holy
Browse files

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: #428
parent 98f4bdbe
Pipeline #128440 passed with stage
in 1 minute and 28 seconds
......@@ -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 }'"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment