txlongpollfixture

Merge lp:~allenap/txlongpollfixture/bits-n-bobs into lp:txlongpollfixture

  1. bits-n-bobs
  2. Merge into trunk
Proposed by Gavin Panella
Status: Merged
Approved by: Julian Edwards
Approved revision: 27
Merged at revision: 27
Proposed branch: lp:~allenap/txlongpollfixture/bits-n-bobs
Merge into: lp:txlongpollfixture
Diff against target: 96 lines (+28/-10)
4 files modified
.bzrignore (+8/-0)
Makefile (+8/-2)
README (+11/-7)
setup.py (+1/-1)
To merge this branch: bzr merge lp:~allenap/txlongpollfixture/bits-n-bobs
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Raphaël Badin (community) code* Approve
Review via email: mp+77182@code.launchpad.net

Description of the change

Variety of fixes, including a version bump.

To post a comment you must log in.
Revision history for this message
Raphaël Badin (rvb) wrote :

Thanks for the cleanup & fixes.

43 - $(RM) -r .installed.cfg
44 + $(RM) .installed.cfg

Whaouh, that's laser-sharp cleanup ;).

review: Approve (code*)
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.bzrignore'
2--- .bzrignore 1970-01-01 00:00:00 +0000
3+++ .bzrignore 2011-09-27 15:13:36 +0000
4@@ -0,0 +1,8 @@
5+*.egg-info
6+./.installed.cfg
7+./bin
8+./develop-eggs
9+./dist
10+./download-cache
11+./eggs
12+./parts
13
14=== modified file 'Makefile'
15--- Makefile 2011-09-26 09:35:28 +0000
16+++ Makefile 2011-09-27 15:13:36 +0000
17@@ -37,24 +37,30 @@
18 build: $(BUILDOUT_BIN)
19
20
21-dist: setup.py
22+dist: $(PY)
23 $(PY) setup.py egg_info -r sdist
24
25
26 check: bin/test
27 ./bin/test -vv
28
29+
30 clean: clean_buildout clean_eggs
31
32+
33 clean_eggs:
34+ $(RM) -r download-cache
35+ $(RM) -r *.egg-info
36 $(RM) -r eggs
37
38+
39 clean_buildout:
40 $(RM) -r bin
41 $(RM) -r parts
42 $(RM) -r develop-eggs
43- $(RM) -r .installed.cfg
44+ $(RM) .installed.cfg
45 $(RM) -r build
46+ $(RM) -r dist
47
48
49 .PHONY: build check default dist clean clean_buildout clean_eggs
50
51=== modified file 'README'
52--- README 2011-09-27 09:48:55 +0000
53+++ README 2011-09-27 15:13:36 +0000
54@@ -13,17 +13,21 @@
55
56 $ make check
57
58+
59 Running
60 -------
61
62-Make sure that the buildout-generated bin/ directory containing the txlongpoll
63-executable is in the PATH or the fixture won't find it.
64+Make sure that the buildout-generated bin/ directory containing the
65+txlongpoll executable is in the PATH, or specify an absolute path
66+with txlongpoll_bin, otherwise the fixture won't find it.
67
68 Example usage:
69
70 >>> class MyTest(testtools.TestCase):
71- ... fixture = TxLongPollFixture(
72- ... broker_user="guest", broker_password="guest", frontend_port=9999,
73- ... broker_vhost="/", broker_host="localhost", broker_port=5672,
74- ... txlongpoll_bin="txlongpoll")
75- ... self.useFixture()
76+ ... def test_thingy(self):
77+ ... fixture = TxLongPollFixture(
78+ ... frontend_port=9999, broker_user="guest",
79+ ... broker_password="guest", broker_vhost="/",
80+ ... broker_host="localhost", broker_port=5672,
81+ ... txlongpoll_bin="txlongpoll")
82+ ... self.useFixture(fixture)
83
84=== removed directory 'download-cache'
85=== modified file 'setup.py'
86--- setup.py 2011-09-23 15:09:06 +0000
87+++ setup.py 2011-09-27 15:13:36 +0000
88@@ -6,7 +6,7 @@
89
90 setup(
91 name='txlongpollfixture',
92- version="0.1",
93+ version="0.1.1",
94 packages=find_packages('.'),
95 package_dir={'': '.'},
96 include_package_data=True,

Subscribers

People subscribed via source and target branches

to all changes: