Merge lp:~james-w/udd/packages-last-update into lp:udd

Proposed by James Westby on 2012-04-05
Status: Merged
Approved by: Jonathan Lange on 2012-04-10
Approved revision: 573
Merged at revision: 574
Proposed branch: lp:~james-w/udd/packages-last-update
Merge into: lp:udd
Diff against target: 35 lines (+8/-2)
2 files modified
udd/icommon.py (+2/-2)
udd/tests/test_package_database.py (+6/-0)
To merge this branch: bzr merge lp:~james-w/udd/packages-last-update
Reviewer Review Type Date Requested Status
Jonathan Lange (community) 2012-04-05 Approve on 2012-04-10
Review via email: mp+101009@code.launchpad.net

Commit Message

Return a datetime from PackageDatabase.last_update() too.

Description of the Change

Hi,

This is one more bit of fallout from the storm change that the overnight
cronjobs found.

Thanks,

James

To post a comment you must log in.
Jonathan Lange (jml) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'udd/icommon.py'
2--- udd/icommon.py 2012-04-04 17:32:38 +0000
3+++ udd/icommon.py 2012-04-05 17:26:21 +0000
4@@ -914,8 +914,8 @@
5 row = c.execute('select * from %s order by anupdate desc'
6 % self.UPDATE_TABLE).get_one()
7 if row is not None:
8- return row[0]
9- return row
10+ return make_datetime(row[0])
11+ return None
12
13 def update_packages(self, package_dict):
14 with Cursor(self.conn) as c:
15
16=== modified file 'udd/tests/test_package_database.py'
17--- udd/tests/test_package_database.py 2012-03-23 16:56:38 +0000
18+++ udd/tests/test_package_database.py 2012-04-05 17:26:21 +0000
19@@ -1,3 +1,5 @@
20+from datetime import datetime
21+
22 from bzrlib import tests
23
24 from udd import icommon, idb
25@@ -12,6 +14,10 @@
26 def test_last_update_in_empty(self):
27 self.assertEquals(None, self.db.last_update())
28
29+ def test_last_update(self):
30+ self.db.update_packages({})
31+ self.assertIsInstance(self.db.last_update(), datetime)
32+
33 def test_update_packages(self):
34 self.db.update_packages({'foo': 1, 'bar': 0})
35 self.assertEquals(set(['foo']), self.db.list_packages_in_main())

Subscribers

People subscribed via source and target branches