diff --git a/.travis.yml b/.travis.yml index ea656ce..37e88fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,8 +17,8 @@ script: - cp -r tests/fixtures/me.yml config/me.yml - docker-compose up -d - docker-compose ps - - WEB_PORT=5006 DATA_DIR=./tests/fixtures/instance1/data CONFIG_DIR=./tests/fixtures/instance1/config docker-compose -p instance1 up + - WEB_PORT=5006 DATA_DIR=tests/fixtures/instance1/data CONFIG_DIR=tests/fixtures/instance1/config docker-compose -p instance1 up -d - docker-compose -p instance1 ps - - WEB_PORT=5007 DATA_DIR=./tests/fixtures/instance2/data CONFIG_DIR=./tests/fixtures/instance2/config docker-compose -p instance2 up + - WEB_PORT=5007 DATA_DIR=tests/fixtures/instance2/data CONFIG_DIR=tests/fixtures/instance2/config docker-compose -p instance2 up -d - docker-compose -p instance2 ps - pytest -v --ignore data diff --git a/tests/fixtures/instance1/config/me.yml b/tests/fixtures/instance1/config/me.yml new file mode 100644 index 0000000..2513938 --- /dev/null +++ b/tests/fixtures/instance1/config/me.yml @@ -0,0 +1,7 @@ +username: 'instance_1' +name: 'Instance 1' +icon_url: 'https://sos-ch-dk-2.exo.io/microblogpub/microblobpub.png' +domain: 'localhost:5006' +summary: 'instance 1 summary' +pass: '$2b$12$nEgJMgaYbXSPOvgnqM4jSeYnleKhXqsFgv/o3hg12x79uEdsR4cUy' # hello +https: false diff --git a/tests/fixtures/instance2/config/me.yml b/tests/fixtures/instance2/config/me.yml new file mode 100644 index 0000000..844e5c8 --- /dev/null +++ b/tests/fixtures/instance2/config/me.yml @@ -0,0 +1,7 @@ +username: 'instance_2' +name: 'Instance 2' +icon_url: 'https://sos-ch-dk-2.exo.io/microblogpub/microblobpub.png' +domain: 'localhost:5007' +summary: 'instance 2 summary' +pass: '$2b$12$nEgJMgaYbXSPOvgnqM4jSeYnleKhXqsFgv/o3hg12x79uEdsR4cUy' # hello +https: false