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

[Jelmer Vernooij]

The branch, master has been updated
       via  a977e10 Make read_err return a file object.
       via  000d005 Make read_log return a file.
      from  74a3b6d Simplify status handling.

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


- Log -----------------------------------------------------------------
commit a977e107225ddf55af846a7449b40591a023dc5a
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 7 22:30:02 2010 +0100

    Make read_err return a file object.

commit 000d0050e6b503d077511f4fdaa1e0ed6dd31c12
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 7 22:27:23 2010 +0100

    Make read_log return a file.

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

Summary of changes:
 buildfarm/data.py            |   27 ++++++++++++++++++---------
 buildfarm/tests/test_data.py |    4 ++--
 web/build.py                 |   12 ++++++++++--
 3 files changed, 30 insertions(+), 13 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/data.py b/buildfarm/data.py
index dd92b8e..74caede 100644
--- a/buildfarm/data.py
+++ b/buildfarm/data.py
@@ -168,18 +168,19 @@ class Build(object):
 
     def read_log(self):
         """read full log file"""
-        f = open(self._store.build_fname(self.tree, self.host, self.compiler, self.rev)+".log", "r")
-        try:
-            return f.read()
-        finally:
-            f.close()
+        return open(self._store.build_fname(self.tree, self.host, self.compiler, self.rev)+".log", "r")
 
     def read_err(self):
         """read full err file"""
-        return util.FileLoad(self._store.build_fname(self.tree, self.host, self.compiler, self.rev)+".err")
+        return open(self._store.build_fname(self.tree, self.host, self.compiler, self.rev)+".err", 'r')
+
 
     def log_checksum(self):
-        return hashlib.sha1(self.read_log()).hexdigest()
+        f = self.read_log()
+        try:
+            return hashlib.sha1(f.read()).hexdigest()
+        finally:
+            f.close()
 
     def revision_details(self):
         """get the revision of build
@@ -210,8 +211,16 @@ class Build(object):
         :return: tuple with build status
         """
 
-        log = self.read_log()
-        err = self.read_err()
+        f = self.read_log()
+        try:
+            log = f.read()
+        finally:
+            f.close()
+        f = self.read_err()
+        try:
+            err = f.read()
+        finally:
+            f.close()
 
         return build_status_from_logs(log, err)
 
diff --git a/buildfarm/tests/test_data.py b/buildfarm/tests/test_data.py
index a8c2f2c..2cdc5e0 100755
--- a/buildfarm/tests/test_data.py
+++ b/buildfarm/tests/test_data.py
@@ -128,7 +128,7 @@ class BuildResultStoreTests(BuildFarmTestCase):
         path = self.create_mock_logfile("tdb", "charis", "cc",
             contents="This is what a log file looks like.")
         build = self.x.get_build("tdb", "charis", "cc")
-        self.assertEquals("This is what a log file looks like.", build.read_log())
+        self.assertEquals("This is what a log file looks like.", build.read_log().read())
 
     def test_read_err(self):
         self.create_mock_logfile("tdb", "charis", "cc")
@@ -136,7 +136,7 @@ class BuildResultStoreTests(BuildFarmTestCase):
             kind="stderr",
             contents="This is what an stderr file looks like.")
         build = self.x.get_build("tdb", "charis", "cc")
-        self.assertEquals("This is what an stderr file looks like.", build.read_err())
+        self.assertEquals("This is what an stderr file looks like.", build.read_err().read())
 
     def test_revision_details(self):
         self.create_mock_logfile("tdb", "charis", "cc", contents="""
diff --git a/web/build.py b/web/build.py
index 473af1d..93c6086 100755
--- a/web/build.py
+++ b/web/build.py
@@ -403,8 +403,16 @@ def view_build(myself, tree, host, compiler, rev, plain_logs=False):
     if rev:
         assert re.match("^[0-9a-fA-F]*$", rev)
 
-    log = build.read_log()
-    err = build.read_err()
+    f = build.read_log()
+    try:
+        log = f.read()
+    finally:
+        f.close()
+    f = build.read_err()
+    try:
+        err = f.read()
+    finally:
+        f.close()
 
     if log:
         log = cgi.escape(log)


-- 
build.samba.org