fix next travis-ci problem

This commit is contained in:
Noah Levitt 2019-04-02 12:05:08 -07:00
parent 9c658cddf7
commit 85c6ac0ab2
3 changed files with 8 additions and 9 deletions

View file

@ -36,13 +36,12 @@
- fonts-thai-tlwg - fonts-thai-tlwg
- fonts-lklug-sinhala - fonts-lklug-sinhala
- name: mkdir /etc/service/warcprox - name: mkdir /etc/service/{Xvnc,vnc-websock,brozzler-worker}
file: file:
path: '/etc/service/{{item}}' path: '/etc/service/{{item}}'
state: directory state: directory
with_items: with_items:
- Xvnc - Xvnc
- websockify
- vnc-websock - vnc-websock
- brozzler-worker - brozzler-worker
become: true become: true

View file

@ -35,10 +35,10 @@ import logging
import warcprox import warcprox
def start_service(service): def start_service(service):
subprocess.check_call(['sudo', 'service', service, 'start']) subprocess.check_call(['sudo', 'svc', '-u', '/etc/service/' + service])
def stop_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') @pytest.fixture(scope='module')
def httpd(request): def httpd(request):

View file

@ -10,11 +10,11 @@ cd $(dirname "${BASH_SOURCE[0]}")
vagrant up vagrant up
echo service status: echo service status:
vagrant ssh -- 'status warcprox ; vagrant ssh -- 'sudo svcstat /etc/service/warcprox ;
status Xvnc ; sudo svcstat /etc/service/Xvnc ;
status brozzler-worker ; sudo svcstat /etc/service/brozzler-worker ;
status brozzler-dashboard ; sudo svcstat /etc/service/brozzler-dashboard ;
status vnc-websock' sudo svcstat /etc/service/vnc-websock'
echo echo
vagrant ssh -- 'set -x ; source /opt/brozzler-ve3/bin/activate && pip install pytest && pip install --upgrade --pre "warcprox>=2.1b1.dev86"' vagrant ssh -- 'set -x ; source /opt/brozzler-ve3/bin/activate && pip install pytest && pip install --upgrade --pre "warcprox>=2.1b1.dev86"'