Merge remote-tracking branch 'origin/cds-1846-build-user-table' into …

…test/staging
Unity-Technologies · Mar 29, 2018 · e6b4991 · e6b4991
2 parents 0d4e531 + 7ce8e00
commit e6b4991
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/master/buildbot/test/fake/fakedb.py b/master/buildbot/test/fake/fakedb.py
@@ -1448,6 +1448,13 @@ def identifierToUid(self, identifier):
                 return defer.succeed(uid)
         return defer.succeed(None)
 
+    def getUidByLdapUsername(self, username):
+        for uid in self.users:
+            if self.users[uid]['identifier'].startswith(username):
+                return defer.succeed(uid)
+        return defer.succeed(None)
+
+
 class FakeDBConnector(object):
     """
     A stand-in for C{master.db} that operates without an actual database

diff --git a/master/buildbot/test/unit/test_status_builder_cache.py b/master/buildbot/test/unit/test_status_builder_cache.py
@@ -20,10 +20,12 @@
 from buildbot.test.fake import fakemaster
 from buildbot.test.fake.fakedb import FakeBuildsComponent, FakeUsersComponent, User
 
+
 class FakeDBConnector():
     def __init__(self):
         self.builds = FakeBuildsComponent(self, [])
-        self.users = FakeUsersComponent(self, [User(uid=1, identifier='soap'),])
+        self.users = FakeUsersComponent(self, "test_status_builder_cache")
+        self.users.insertTestData([User(uid=1, identifier='soap')])
 
 
 class TestBuildStatus(unittest.TestCase):