Merge lp:~julian-edwards/launchpad/bug-517098 into lp:launchpad/db-devel

[Julian Edwards]

Give update-pkg-cache.py its own database user for stub.

PackageCacheUpdater doesn't have any tests so I'll Q/A this on dogfood.

[Graham Binns (gmb)]

Hi Julian,

This branch is good to land, but I've one question:

> === modified file 'lib/lp/soyuz/tests/test_buildqueue.py'
> --- lib/lp/soyuz/tests/test_buildqueue.py 2010-02-25 16:34:13 +0000
> +++ lib/lp/soyuz/tests/test_buildqueue.py 2010-03-08 16:50:38 +0000
> @@ -96,8 +96,12 @@
> queue_entry.lastscore)
>
>
> -def check_mintime_to_builder(test, bq, min_time):
> +def check_mintime_to_builder(
> + test, bq, min_time, time_stamp=datetime.utcnow()):

Isn't this default a bit fragile? It would be better to declare the
default as None and then have

    if time_stamp is None:
        time_stamp = datetime.utcnow()

in the test, wouldn't it?

> """Test the estimated time until a builder becomes available."""
> + # Monkey-patch BuildQueueSet._now() so it returns a constant time stamp
> + # that's not too far in the future. This avoids spurious test failures.
> + monkey_patch_the_now_property(bq)
> delay = bq._estimateTimeToNextBuilder()
> test.assertTrue(
> delay <= min_time,

Otherwise, r=me.

review: Approve (code)

[Stuart Bishop (stub)]

DB related stuff is all good. No need for me to review this really.

review: Approve (db)

[Julian Edwards (julian-edwards)]

The diff is crack, I branched off devel by mistake and this is targeted to db-devel :(

I've pushed up a new branch that was branched from db-devel. gmb already approved the tiny diff in IRC.

=== modified file 'cronscripts/update-pkgcache.py'
--- cronscripts/update-pkgcache.py	2009-11-17 02:33:27 +0000
+++ cronscripts/update-pkgcache.py	2010-03-10 09:56:33 +0000
@@ -101,6 +101,6 @@
 
 if __name__ == '__main__':
     script = PackageCacheUpdater(
-        'update-cache', dbuser=config.statistician.dbuser)
+        'update-cache', dbuser="update-pkg-cache")
     script.lock_and_run()
 

=== modified file 'database/schema/security.cfg'
--- database/schema/security.cfg	2010-03-05 11:46:55 +0000
+++ database/schema/security.cfg	2010-03-10 09:56:33 +0000
@@ -1914,3 +1914,9 @@
 public.apportjob                        = SELECT, INSERT, UPDATE, DELETE
 public.libraryfilealias                 = SELECT, INSERT, UPDATE
 public.libraryfilecontent               = SELECT, INSERT, UPDATE
+
+[update-pkg-cache]
+# update-pkg-cache.py split off from the statistician user so that it's easier
+# to see its activity separate from update-stats.py
+type=user
+groups=statistician