Merge pull request buildbot#3333 from rjarry/sqlite-memory

db: allow using in-memory sqlite uri

Author: tardyp

Makefile

@@ -65,7 +65,7 @@ docker-buildbot-master-ubuntu:
 
 $(VENV_NAME):
 	virtualenv -p $(VENV_PY_VERSION) $(VENV_NAME)
-	$(VENV_NAME)/bin/pip install -U pip
+	$(VENV_NAME)/bin/pip install -U pip setuptools
 	$(VENV_NAME)/bin/pip install -e pkg \
 		-e 'master[tls,test,docs]' \
 		-e 'worker[test]' \

master/buildbot/db/connector.py

@@ -127,6 +127,11 @@ def setup(self, check_version=True, verbose=True):
 
         # make sure the db is up to date, unless specifically asked not to
         if check_version:
+            if db_url == 'sqlite://':
+                # Using in-memory database. Since it is reset after each process
+                # restart, `buildbot upgrade-master` cannot be used (data is not
+                # persistent). Upgrade model here to allow startup to continue.
+                self.model.upgrade()
             current = yield self.model.is_current()
             if not current:
                 for l in upgrade_message.format(basedir=self.master.basedir).split('\n'):

master/buildbot/test/unit/test_db_connector.py

@@ -92,6 +92,9 @@ def check(_):
         return d
 
     def test_setup_check_version_bad(self):
+        if self.db_url == 'sqlite://':
+            raise unittest.SkipTest(
+                'sqlite in-memory model is always upgraded at connection')
         d = self.startService(check_version=True)
         return self.assertFailure(d, exceptions.DatabaseNotReadyError)