Merge remote-tracking branch 'origin/master' into ldapper
Conflicts: app.py
This commit is contained in:
commit
11c6c5fa52
10 changed files with 75 additions and 23 deletions
|
@ -24,8 +24,9 @@ class TestConfig(DefaultConfig):
|
|||
|
||||
STORAGE_TYPE = 'FakeStorage'
|
||||
|
||||
BUILDLOGS = TestBuildLogs('logs.quay.io', 'devtable', 'building',
|
||||
'deadbeef-dead-beef-dead-beefdeadbeef')
|
||||
BUILDLOGS_MODULE_AND_CLASS = ('test.testlogs', 'testlogs.TestBuildLogs')
|
||||
BUILDLOGS_OPTIONS = ['logs.quay.io', 'devtable', 'building',
|
||||
'deadbeef-dead-beef-dead-beefdeadbeef']
|
||||
|
||||
USERFILES_TYPE = 'FakeUserfiles'
|
||||
|
||||
|
|
Reference in a new issue