From 3dbe4ba4e9d089ae91327359978db8d7a84448f6 Mon Sep 17 00:00:00 2001 From: Thomas Sileo Date: Wed, 30 May 2018 22:50:45 +0200 Subject: [PATCH] Debug the CI --- .travis.yml | 2 +- config.py | 4 ++-- tests/federation_test.py | 2 +- utils/key.py | 4 +++- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 60dd487..c3f7aa0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,6 @@ script: # Integration tests first - python -m pytest -v --ignore data -k integration # Federation tests (with two local instances) - - ls -lR tests + - ls -lR /app - python -m pytest -v -s --ignore data -k federation - docker logs instance1_web_1 diff --git a/config.py b/config.py index e4c3912..b1645df 100644 --- a/config.py +++ b/config.py @@ -5,7 +5,7 @@ from pymongo import MongoClient import requests from utils import strtobool -from utils.key import Key +from utils.key import Key, KEY_DIR from utils.actor_service import ActorService from utils.object_service import ObjectService @@ -35,7 +35,7 @@ HEADERS = [ ] -with open('config/me.yml') as f: +with open(os.path.join(KEY_DIR, 'me.yml')) as f: conf = yaml.load(f) USERNAME = conf['username'] diff --git a/tests/federation_test.py b/tests/federation_test.py index 053b6ec..c681dc1 100644 --- a/tests/federation_test.py +++ b/tests/federation_test.py @@ -19,7 +19,7 @@ class Instance(object): self.docker_url = docker_url or host_url self.session = requests.Session() self._create_delay = 10 - with open(os.path.join(os.path.abspath(__file__), f'fixtures/{name}/config/admin_api_key.key')) as f: + with open(os.path.join(os.path.dirname(os.path.abspath(__file__)), f'fixtures/{name}/config/admin_api_key.key')) as f: api_key = f.read() self._auth_headers = {'Authorization': f'Bearer {api_key}'} diff --git a/utils/key.py b/utils/key.py index e101af7..f974aac 100644 --- a/utils/key.py +++ b/utils/key.py @@ -4,7 +4,9 @@ import binascii from Crypto.PublicKey import RSA from typing import Callable -KEY_DIR = 'config/' +KEY_DIR = os.path.join( + os.path.dirname(os.path.abspath(__file__)), '..', 'config' +) def _new_key() -> str: