[SCM] build.samba.org - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  42e888a Move hostdb to a separate db directory.
      from  6a85d8c Support passing timeout to the StormCachingBuildFarm.

http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 42e888aa3a8bcdf2525cc6739339aa647d77f584
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Nov 15 01:39:18 2010 +0100

    Move hostdb to a separate db directory.

-----------------------------------------------------------------------

Summary of changes:
 buildfarm/sqldb.py          |    2 +-
 buildfarm/tests/__init__.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py
index faf3cbf..dc506f0 100644
--- a/buildfarm/sqldb.py
+++ b/buildfarm/sqldb.py
@@ -207,7 +207,7 @@ class StormCachingBuildFarm(BuildFarm):
     def _get_store(self):
         if self.store is not None:
             return self.store
-        db_path = os.path.join(self.path, "hostdb.sqlite")
+        db_path = os.path.join(self.path, "db", "hostdb.sqlite")
         db = create_database("sqlite:%s?timeout=%f" % (db_path, self.timeout))
         self.store = Store(db)
         setup_schema(self.store)
diff --git a/buildfarm/tests/__init__.py b/buildfarm/tests/__init__.py
index fb98f55..b3226d5 100644
--- a/buildfarm/tests/__init__.py
+++ b/buildfarm/tests/__init__.py
@@ -80,10 +80,10 @@ class BuildFarmTestCase(TestCase):
         super(BuildFarmTestCase, self).setUp()
         self.path = tempfile.mkdtemp()
 
-        for subdir in ["data", "data/upload", "data/oldrevs", "cache", "web", "lcov", "lcov/data"]:
+        for subdir in ["data", "data/upload", "data/oldrevs", "db", "cache", "web", "lcov", "lcov/data"]:
             os.mkdir(os.path.join(self.path, subdir))
 
-        db = database.create_database("sqlite:"+os.path.join(self.path, "hostdb.sqlite"))
+        db = database.create_database("sqlite:"+os.path.join(self.path, "db", "hostdb.sqlite"))
         store = Store(db)
         setup_schema(store)
         store.flush()


-- 
build.samba.org