Launchpad itself

Merge lp:~stevenk/launchpad/moar-auditor into lp:launchpad

  1. moar-auditor
  2. Merge into devel
Proposed by Steve Kowalik on 2012-08-22
Status: Merged
Approved by: Curtis Hovey on 2012-08-22
Approved revision: no longer in the source branch.
Merged at revision: 15854
Proposed branch: lp:~stevenk/launchpad/moar-auditor
Merge into: lp:launchpad
Diff against target: 80 lines (+2/-19)
4 files modified
buildout.cfg (+0/-8)
lib/lp/services/auditor/client.py (+0/-1)
lib/lp/services/auditor/server.py (+0/-8)
versions.cfg (+2/-2)
To merge this branch: bzr merge lp:~stevenk/launchpad/moar-auditor
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code 2012-08-22 Approve on 2012-08-22
Review via email: mp+120706@code.launchpad.net

Commit Message

Jump to auditor 0.0.3 and auditorfixture 0.0.4.

Description of the Change

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.

To post a comment you must log in.
Curtis Hovey (sinzui) wrote :

Thank you.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'buildout.cfg'
2--- buildout.cfg 2012-08-13 17:49:31 +0000
3+++ buildout.cfg 2012-08-22 05:59:19 +0000
4@@ -9,7 +9,6 @@
5 iharness
6 i18n
7 txlongpoll
8- auditor
9 unzip = true
10 eggs-directory = eggs
11 download-cache = download-cache
12@@ -98,10 +97,3 @@
13 initialization = ${scripts:initialization}
14 entry-points = twistd-for-txlongpoll=twisted.scripts.twistd:run
15 scripts = twistd-for-txlongpoll
16-
17-[auditor]
18-recipe = z3c.recipe.scripts
19-eggs = auditor
20-include-site-packages = false
21-entry-points = auditor-manage=auditor.manage:run
22-scripts = auditor-manage
23
24=== modified file 'lib/lp/services/auditor/client.py'
25--- lib/lp/services/auditor/client.py 2012-08-06 04:45:06 +0000
26+++ lib/lp/services/auditor/client.py 2012-08-22 05:59:19 +0000
27@@ -28,7 +28,6 @@
28 object_to_enterpriseid(obj), operation,
29 object_to_enterpriseid(actorobj), comment, details)
30
31-
32 def receive(self, obj=None, operation=None, actorobj=None, limit=None):
33 if obj:
34 obj = object_to_enterpriseid(obj)
35
36=== modified file 'lib/lp/services/auditor/server.py'
37--- lib/lp/services/auditor/server.py 2012-07-02 23:22:01 +0000
38+++ lib/lp/services/auditor/server.py 2012-08-22 05:59:19 +0000
39@@ -8,13 +8,10 @@
40 'AuditorServer',
41 ]
42
43-import os
44 from textwrap import dedent
45
46 from auditorfixture.server import AuditorFixture
47
48-import lp
49-
50
51 class AuditorServer(AuditorFixture):
52 """An Auditor server fixture with Launchpad-specific config.
53@@ -23,11 +20,6 @@
54 configuration.
55 """
56
57- def __init__(self, port=None, logfile=None, manage_bin=None):
58- manage_bin = os.path.join(
59- os.path.dirname(lp.__file__), '../../bin/auditor-manage')
60- super(AuditorServer, self).__init__(port, logfile, manage_bin)
61-
62 def setUp(self):
63 super(AuditorServer, self).setUp()
64 self.service_config = dedent("""\
65
66=== modified file 'versions.cfg'
67--- versions.cfg 2012-08-22 05:31:23 +0000
68+++ versions.cfg 2012-08-22 05:59:19 +0000
69@@ -8,9 +8,9 @@
70 amqplib = 1.0.2
71 anyjson = 0.3.1
72 argparse = 1.2.1
73-auditor = 0.0.2
74+auditor = 0.0.3
75 auditorclient = 0.0.2
76-auditorfixture = 0.0.3
77+auditorfixture = 0.0.4
78 BeautifulSoup = 3.1.0.1
79 bson = 0.3.2
80 # The source for this version of bzr is at lp:~benji/bzr/bug-998040