forked from forks/microblog.pub
Debug the CI
This commit is contained in:
parent
d2be270ccb
commit
3dbe4ba4e9
4 changed files with 7 additions and 5 deletions
|
@ -24,6 +24,6 @@ script:
|
||||||
# Integration tests first
|
# Integration tests first
|
||||||
- python -m pytest -v --ignore data -k integration
|
- python -m pytest -v --ignore data -k integration
|
||||||
# Federation tests (with two local instances)
|
# Federation tests (with two local instances)
|
||||||
- ls -lR tests
|
- ls -lR /app
|
||||||
- python -m pytest -v -s --ignore data -k federation
|
- python -m pytest -v -s --ignore data -k federation
|
||||||
- docker logs instance1_web_1
|
- docker logs instance1_web_1
|
||||||
|
|
|
@ -5,7 +5,7 @@ from pymongo import MongoClient
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
from utils import strtobool
|
from utils import strtobool
|
||||||
from utils.key import Key
|
from utils.key import Key, KEY_DIR
|
||||||
from utils.actor_service import ActorService
|
from utils.actor_service import ActorService
|
||||||
from utils.object_service import ObjectService
|
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)
|
conf = yaml.load(f)
|
||||||
|
|
||||||
USERNAME = conf['username']
|
USERNAME = conf['username']
|
||||||
|
|
|
@ -19,7 +19,7 @@ class Instance(object):
|
||||||
self.docker_url = docker_url or host_url
|
self.docker_url = docker_url or host_url
|
||||||
self.session = requests.Session()
|
self.session = requests.Session()
|
||||||
self._create_delay = 10
|
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()
|
api_key = f.read()
|
||||||
self._auth_headers = {'Authorization': f'Bearer {api_key}'}
|
self._auth_headers = {'Authorization': f'Bearer {api_key}'}
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,9 @@ import binascii
|
||||||
from Crypto.PublicKey import RSA
|
from Crypto.PublicKey import RSA
|
||||||
from typing import Callable
|
from typing import Callable
|
||||||
|
|
||||||
KEY_DIR = 'config/'
|
KEY_DIR = os.path.join(
|
||||||
|
os.path.dirname(os.path.abspath(__file__)), '..', 'config'
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def _new_key() -> str:
|
def _new_key() -> str:
|
||||||
|
|
Loading…
Reference in a new issue