Merge remote-tracking branch 'origin/master' into touchdown

Conflicts:
	test/data/test.db

test/test_api_usage.py

@@ -68,6 +68,8 @@ CSRF_TOKEN_KEY = '_csrf_token'
 CSRF_TOKEN = '123csrfforme'
 
 class ApiTestCase(unittest.TestCase):
+  maxDiff = None
+
   @staticmethod
   def _add_csrf(without_csrf):
     parts = urlparse(without_csrf)
@@ -968,7 +970,7 @@ class TestRepoBuilds(ApiTestCase):
                                 params=dict(repository=ADMIN_ACCESS_USER + '/building'))
     
     assert len(json['builds']) > 0
-    build = json['builds'][0]
+    build = json['builds'][-1]
 
     assert 'id' in build
     assert 'status' in build

test/testconfig.py

@@ -24,7 +24,8 @@ 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'

test/testlogs.py

@@ -5,7 +5,7 @@ from loremipsum import get_sentence
 from functools import wraps
 from copy import deepcopy
 
-from data.buildlogs import BuildLogs
+from data.buildlogs import RedisBuildLogs
 
 
 logger = logging.getLogger(__name__)
@@ -32,7 +32,7 @@ def maybe_advance_script(is_get_status=False):
   return inner_advance
 
 
-class TestBuildLogs(BuildLogs):
+class TestBuildLogs(RedisBuildLogs):
   COMMAND_TYPES = ['FROM', 'MAINTAINER', 'RUN', 'CMD', 'EXPOSE', 'ENV', 'ADD', 
                    'ENTRYPOINT', 'VOLUME', 'USER', 'WORKDIR']
   STATUS_TEMPLATE = {