launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

Steve Kowalik has proposed merging lp:~stevenk/launchpad/moar-auditor into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/moar-auditor/+merge/120706

Jump to auditor 0.0.3 and auditorfixture 0.0.4, which means bin/auditor-manage can die since the fixture can just deal itself, as well as AuditorServer's __init__, since we no longer need to feed it our bin/auditor-manage.

I'm not certain why AuditorServer felt the need to import lp.
-- 
https://code.launchpad.net/~stevenk/launchpad/moar-auditor/+merge/120706
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/moar-auditor into lp:launchpad.

=== modified file 'buildout.cfg'
--- buildout.cfg	2012-08-13 17:49:31 +0000
+++ buildout.cfg	2012-08-22 05:59:19 +0000
@@ -9,7 +9,6 @@
     iharness
     i18n
     txlongpoll
-    auditor
 unzip = true
 eggs-directory = eggs
 download-cache = download-cache
@@ -98,10 +97,3 @@
 initialization = ${scripts:initialization}
 entry-points = twistd-for-txlongpoll=twisted.scripts.twistd:run
 scripts = twistd-for-txlongpoll
-
-[auditor]
-recipe = z3c.recipe.scripts
-eggs = auditor
-include-site-packages = false
-entry-points = auditor-manage=auditor.manage:run
-scripts = auditor-manage

=== modified file 'lib/lp/services/auditor/client.py'
--- lib/lp/services/auditor/client.py	2012-08-06 04:45:06 +0000
+++ lib/lp/services/auditor/client.py	2012-08-22 05:59:19 +0000
@@ -28,7 +28,6 @@
             object_to_enterpriseid(obj), operation,
             object_to_enterpriseid(actorobj), comment, details)
 
-
     def receive(self, obj=None, operation=None, actorobj=None, limit=None):
         if obj:
             obj = object_to_enterpriseid(obj)

=== modified file 'lib/lp/services/auditor/server.py'
--- lib/lp/services/auditor/server.py	2012-07-02 23:22:01 +0000
+++ lib/lp/services/auditor/server.py	2012-08-22 05:59:19 +0000
@@ -8,13 +8,10 @@
     'AuditorServer',
     ]
 
-import os
 from textwrap import dedent
 
 from auditorfixture.server import AuditorFixture
 
-import lp
-
 
 class AuditorServer(AuditorFixture):
     """An Auditor server fixture with Launchpad-specific config.
@@ -23,11 +20,6 @@
         configuration.
     """
 
-    def __init__(self, port=None, logfile=None, manage_bin=None):
-        manage_bin = os.path.join(
-            os.path.dirname(lp.__file__), '../../bin/auditor-manage')
-        super(AuditorServer, self).__init__(port, logfile, manage_bin)
-
     def setUp(self):
         super(AuditorServer, self).setUp()
         self.service_config = dedent("""\

=== modified file 'versions.cfg'
--- versions.cfg	2012-08-22 05:31:23 +0000
+++ versions.cfg	2012-08-22 05:59:19 +0000
@@ -8,9 +8,9 @@
 amqplib = 1.0.2
 anyjson = 0.3.1
 argparse = 1.2.1
-auditor = 0.0.2
+auditor = 0.0.3
 auditorclient = 0.0.2
-auditorfixture = 0.0.3
+auditorfixture = 0.0.4
 BeautifulSoup = 3.1.0.1
 bson = 0.3.2
 # The source for this version of bzr is at lp:~benji/bzr/bug-998040