tests: do not leave running httpd after tests exit
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
1 parent
5dba2442a1
commit
7b0e70b72f
3 files changed
+4
-4
No files matched your search
+2
-2
@@ -157,7 +157,7 @@ setup_fake_remote_repo1() {
|
||||
mkdir ${test_tmpdir}/httpd
|
||||
cd httpd
|
||||
ln -s ${test_tmpdir}/ostree-srv ostree
|
||||
ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port $args
|
||||
ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/httpd-port $args
|
||||
port=$(cat ${test_tmpdir}/httpd-port)
|
||||
echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
|
||||
cd ${oldpwd}
|
||||
@@ -261,7 +261,7 @@ EOF
|
||||
mkdir ${test_tmpdir}/httpd
|
||||
cd httpd
|
||||
ln -s ${test_tmpdir} ostree
|
||||
ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port $args
|
||||
ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/httpd-port $args
|
||||
port=$(cat ${test_tmpdir}/httpd-port)
|
||||
echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
|
||||
cd ${oldpwd}
|
||||
|
||||
@@ -51,7 +51,7 @@ cd ${test_tmpdir}
|
||||
mkdir ${test_tmpdir}/httpd
|
||||
cd httpd
|
||||
ln -s ${test_tmpdir}/ostree-srv ostree
|
||||
ostree trivial-httpd --daemonize -p ${test_tmpdir}/httpd-port
|
||||
ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/httpd-port
|
||||
port=$(cat ${test_tmpdir}/httpd-port)
|
||||
echo "http://127.0.0.1:${port}" > ${test_tmpdir}/httpd-address
|
||||
cd ${oldpwd}
|
||||
|
||||
@@ -27,7 +27,7 @@ setup_fake_remote_repo1 "archive-z2"
|
||||
cd ${test_tmpdir}
|
||||
mkdir metalink-data
|
||||
cd metalink-data
|
||||
ostree trivial-httpd --daemonize -p ${test_tmpdir}/metalink-httpd-port
|
||||
ostree trivial-httpd --autoexit --daemonize -p ${test_tmpdir}/metalink-httpd-port
|
||||
metalink_port=$(cat ${test_tmpdir}/metalink-httpd-port)
|
||||
echo "http://127.0.0.1:${metalink_port}" > ${test_tmpdir}/metalink-httpd-address
|
||||
|
||||
|
||||
Reference in new issue
Block a user