changeset 574:f5ba11158030

0.6dev: Follow-ups to recent commits detected by failing builds: * [646]: Updated tests to account for new `'recipe'` in data dict. * [647]: Forgot to move `DESC` along with `rev_time`.
author osimons
date Sun, 05 Jul 2009 17:36:13 +0000
parents 1e9ec4fa31ef
children 9ae8f6a95d4b
files bitten/model.py bitten/tests/admin.py
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/bitten/model.py
+++ b/bitten/model.py
@@ -514,7 +514,7 @@
 
         cursor = db.cursor()
         cursor.execute("SELECT id FROM bitten_build %s "
-                       "ORDER BY rev_time,config DESC,slave"
+                       "ORDER BY rev_time DESC,config,slave"
                        % where, [wc[1] for wc in where_clauses])
         for (id,) in cursor:
             yield Build.fetch(env, id)
--- a/bitten/tests/admin.py
+++ b/bitten/tests/admin.py
@@ -197,12 +197,12 @@
         self.assertEqual({
             'name': 'bar', 'href': '/admin/bitten/configs/bar',
             'label': 'Bar', 'min_rev': '123', 'max_rev': '456',
-            'path': 'branches/bar', 'active': False
+            'path': 'branches/bar', 'active': False, 'recipe': False
         }, configs[0])
         self.assertEqual({
             'name': 'foo', 'href': '/admin/bitten/configs/foo',
             'label': 'Foo', 'min_rev': None, 'max_rev': None,
-            'path': 'branches/foo', 'active': True
+            'path': 'branches/foo', 'active': True, 'recipe': False
         }, configs[1])
 
     def test_process_view_config(self):
Copyright (C) 2012-2017 Edgewall Software