Add basic "federation" tests and some bugfixes

2018-05-26 09:50:59 +02:00
parent 6eb5d24f3e
commit fe46cb4317
7 changed files with 60 additions and 9 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,4 +21,7 @@ script:
 - docker-compose -p instance1 -f docker-compose-tests.yml ps
 - WEB_PORT=5007 CONFIG_DIR=./tests/fixtures/instance2/config docker-compose -p instance2 -f docker-compose-tests.yml up -d
 - docker-compose -p instance2 -f docker-compose-tests.yml ps
- - pytest -v --ignore data
+ # Integration tests first
+ - pytest -v --ignore data -k integration
+ # Federation tests (with two local instances)
+ - pytest -v -s --ignore data -k federation