support case for trash db_url

buildbot · Feb 19, 2015 · 2196751 · 2196751
1 parent 0c1a59d
commit 2196751
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
diff --git a/master/buildbot/db/dbconfig.py b/master/buildbot/db/dbconfig.py
@@ -50,8 +50,12 @@ def __init__(self, BuildmasterConfig, basedir, name="config"):
         self.name = name
 
     def getDb(self):
-        db_engine = enginestrategy.create_engine(self.db_url,
-                                                 basedir=self.basedir)
+        try:
+            db_engine = enginestrategy.create_engine(self.db_url,
+                                                     basedir=self.basedir)
+        except Exception:
+            # db_url is probably trash. Just ignore, config.py db part will create proper message
+            return None
         db = FakeDBConnector()
         db.master = FakeMaster()
         db.pool = FakePool()

diff --git a/master/buildbot/test/unit/test_db_dbconfig.py b/master/buildbot/test/unit/test_db_dbconfig.py
@@ -77,8 +77,8 @@ def setUp(self):
         # as we will open the db twice, we can't use in memory sqlite
         yield self.setUpRealDatabase(table_names=[], sqlite_memory=False)
 
-    def createDbConfig(self):
-        return dbconfig.DbConfig({"db_url": self.db_url}, self.basedir)
+    def createDbConfig(self, db_url=None):
+        return dbconfig.DbConfig({"db_url": db_url or self.db_url}, self.basedir)
 
     def test_default(self):
         def thd():
@@ -93,3 +93,24 @@ def thd():
             self.assertRaises(KeyError, db.get, u"slaves")
 
         return threads.deferToThread(thd)
+
+    def test_bad_url(self):
+        def thd():
+            db = self.createDbConfig("garbage://")
+            self.assertRaises(KeyError, db.get, u"slaves")
+
+        return threads.deferToThread(thd)
+
+    def test_bad_url2(self):
+        def thd():
+            db = self.createDbConfig("trash")
+            self.assertRaises(KeyError, db.get, u"slaves")
+
+        return threads.deferToThread(thd)
+
+    def test_bad_url3(self):
+        def thd():
+            db = self.createDbConfig("sqlite://bad")
+            self.assertRaises(KeyError, db.get, u"slaves")
+
+        return threads.deferToThread(thd)