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

[Jelmer Vernooij]

The branch, master has been updated
       via  71e1bc8 Sort by age rather than by upload time.
       via  de8b990 Unset basename when removing logs.
      from  956c8cb Cope with files that already exist.

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


- Log -----------------------------------------------------------------
commit 71e1bc887a9cbc2453a5c241211d0e8a8a08461b
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 21 17:40:25 2010 +0100

    Sort by age rather than by upload time.

commit de8b990c83413b618138626f4be0e18e44fd9998
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Nov 21 17:21:39 2010 +0100

    Unset basename when removing logs.

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

Summary of changes:
 buildfarm/sqldb.py               |    4 ++++
 buildfarm/web/__init__.py        |    2 +-
 buildfarm/web/tests/test_util.py |   29 -----------------------------
 3 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 buildfarm/web/tests/test_util.py


Changeset truncated at 500 lines:

diff --git a/buildfarm/sqldb.py b/buildfarm/sqldb.py
index c5d2825..ce75c2f 100644
--- a/buildfarm/sqldb.py
+++ b/buildfarm/sqldb.py
@@ -71,6 +71,10 @@ class StormBuild(Build):
         super(StormBuild, self).remove()
         Store.of(self).remove(self)
 
+    def remove_logs(self):
+        super(StormBuild, self).remove_logs()
+        self.basename = None
+
 
 class StormHost(Host):
     __storm_table__ = "host"
diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index c3ef776..4646199 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -586,7 +586,7 @@ class ViewRecentBuildsPage(BuildFarmPage):
 
         cmp_funcs = {
             "revision": lambda a, b: cmp(a.revision, b.revision),
-            "age": lambda a, b: cmp(a.upload_time, b.upload_time),
+            "age": lambda a, b: cmp(a.age, b.age),
             "host": lambda a, b: cmp(a.host, b.host),
             "platform": lambda a, b: cmp(build_platform(a), build_platform(b)),
             "compiler": lambda a, b: cmp(a.compiler, b.compiler),
diff --git a/buildfarm/web/tests/test_util.py b/buildfarm/web/tests/test_util.py
deleted file mode 100644
index d507edd..0000000
--- a/buildfarm/web/tests/test_util.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/python
-# Copyright (C) Jelmer Vernooij <jelmer at samba.org> 2010
-#
-#   This program is free software; you can redistribute it and/or modify
-#   it under the terms of the GNU General Public License as published by
-#   the Free Software Foundation; either version 3 of the License, or
-#   (at your option) any later version.
-#
-#   This program is distributed in the hope that it will be useful,
-#   but WITHOUT ANY WARRANTY; without even the implied warranty of
-#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#   GNU General Public License for more details.
-#
-#   You should have received a copy of the GNU General Public License
-#   along with this program; if not, write to the Free Software
-#   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-import testtools
-from buildfarm.web import build_link
-
-
-class BuildLinkTests(testtools.TestCase):
-
-    def test_build_link_no_rev(self):
-        self.assertEquals("<a href='myself?function=View+Build;host=charis;tree=tdb;compiler=gcc'>status</a>", build_link("myself", "tdb", "charis", "gcc", None, "status"))
-
-
-    def test_build_link_rev(self):
-        self.assertEquals("<a href='myself?function=View+Build;host=charis;tree=tdb;compiler=gcc;revision=42'>status</a>", build_link("myself", "tdb", "charis", "gcc", "42", "status"))


-- 
build.samba.org