diff --git a/ansible/roles/brozzler-worker/tasks/main.yml b/ansible/roles/brozzler-worker/tasks/main.yml index ebf5d2d..4945052 100644 --- a/ansible/roles/brozzler-worker/tasks/main.yml +++ b/ansible/roles/brozzler-worker/tasks/main.yml @@ -36,13 +36,12 @@ - fonts-thai-tlwg - fonts-lklug-sinhala -- name: mkdir /etc/service/warcprox +- name: mkdir /etc/service/{Xvnc,vnc-websock,brozzler-worker} file: path: '/etc/service/{{item}}' state: directory with_items: - Xvnc - - websockify - vnc-websock - brozzler-worker become: true diff --git a/tests/test_cluster.py b/tests/test_cluster.py index f5007a1..13b3c66 100644 --- a/tests/test_cluster.py +++ b/tests/test_cluster.py @@ -35,10 +35,10 @@ import logging import warcprox def start_service(service): - subprocess.check_call(['sudo', 'service', service, 'start']) + subprocess.check_call(['sudo', 'svc', '-u', '/etc/service/' + service]) def stop_service(service): - subprocess.check_call(['sudo', 'service', service, 'stop']) + subprocess.check_call(['sudo', 'svc', '-d', '/etc/service/' + service]) @pytest.fixture(scope='module') def httpd(request): diff --git a/vagrant/run-tests.sh b/vagrant/run-tests.sh index 6ef8022..515b37b 100755 --- a/vagrant/run-tests.sh +++ b/vagrant/run-tests.sh @@ -10,11 +10,11 @@ cd $(dirname "${BASH_SOURCE[0]}") vagrant up echo service status: -vagrant ssh -- 'status warcprox ; - status Xvnc ; - status brozzler-worker ; - status brozzler-dashboard ; - status vnc-websock' +vagrant ssh -- 'sudo svcstat /etc/service/warcprox ; + sudo svcstat /etc/service/Xvnc ; + sudo svcstat /etc/service/brozzler-worker ; + sudo svcstat /etc/service/brozzler-dashboard ; + sudo svcstat /etc/service/vnc-websock' echo vagrant ssh -- 'set -x ; source /opt/brozzler-ve3/bin/activate && pip install pytest && pip install --upgrade --pre "warcprox>=2.1b1.dev86"'