diff options
| author | Ryan Chu <ryan.chu@qt.io> | 2018-09-20 15:16:57 +0200 |
|---|---|---|
| committer | Ryan Chu <ryan.chu@qt.io> | 2018-10-18 19:22:46 +0000 |
| commit | c99b8a3f41e6641c2a254d6e4ba80151734fc58e (patch) | |
| tree | 55c6d14388c20fdf8d8dfd0febeb0a1bf476d9de /tests/testserver/vsftpd/vsftpd.sh | |
| parent | 0d4d06647a9c15dfbe637926557b163ee736c642 (diff) | |
Docker-based test servers for network-related Qt autotests on macOS
There is no docker bridge on macOS. Docker document recommends using
port mapping to connect to a container; but it causes a port conflict
if the user is running a service that binds the same port on the host.
An alternative solution is to deploy the docker environment into
VirtualBox and use the host network option.
Task-number: QTQAINFRA-2293
Change-Id: I05dc65c5f8b4be7a1b1874a4ec7c034cc68679ca
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'tests/testserver/vsftpd/vsftpd.sh')
| -rwxr-xr-x | tests/testserver/vsftpd/vsftpd.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/testserver/vsftpd/vsftpd.sh b/tests/testserver/vsftpd/vsftpd.sh index 1ba1a8c347..845c576534 100755 --- a/tests/testserver/vsftpd/vsftpd.sh +++ b/tests/testserver/vsftpd/vsftpd.sh @@ -43,7 +43,7 @@ cp $TESTDATA/vsftpd.{conf,user_list} /etc/ # Resolve error message "vsftpd failed - probably invalid config" during boot command='start-stop-daemon --start --background -m --oknodo --pidfile /var/run/vsftpd/vsftpd.pid' command+=' --exec ${DAEMON}' -sed -i "s,$command.*$,$command; sleep 1," /etc/init.d/vsftpd +sed -i "s,$command.*$,$command; sleep 10," /etc/init.d/vsftpd # Populate the FTP sites: su $USER -c "cp -r $TESTDATA/ftp ~/ftp" |