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
1
*.egg-info
6
2
./.installed.cfg
7
3
./bin
8
4
./develop-eggs
9
5
./dist
10
6
./download-cache
11
7
./eggs
12
8
./parts
13
0
9
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
37
build: $(BUILDOUT_BIN)
37
build: $(BUILDOUT_BIN)
19
38
38
20
39
39
22
40
dist: setup.py
40
dist: $(PY)
23
41
	$(PY) setup.py egg_info -r sdist
41
	$(PY) setup.py egg_info -r sdist
24
42
42
25
43
43
26
44
check: bin/test
44
check: bin/test
27
45
	./bin/test -vv
45
	./bin/test -vv
28
46
46
29
47
30
47
clean: clean_buildout clean_eggs
48
clean: clean_buildout clean_eggs
31
48
49
32
50
33
49
clean_eggs:
51
clean_eggs:
34
52
	$(RM) -r download-cache
35
53
	$(RM) -r *.egg-info
36
50
	$(RM) -r eggs
54
	$(RM) -r eggs
37
51
55
38
56
39
52
clean_buildout:
57
clean_buildout:
40
53
	$(RM) -r bin
58
	$(RM) -r bin
41
54
	$(RM) -r parts
59
	$(RM) -r parts
42
55
	$(RM) -r develop-eggs
60
	$(RM) -r develop-eggs
44
56
	$(RM) -r .installed.cfg
61
	$(RM) .installed.cfg
45
57
	$(RM) -r build
62
	$(RM) -r build
46
63
	$(RM) -r dist
47
58
64
48
59
65
49
60
.PHONY: build check default dist clean clean_buildout clean_eggs
66
.PHONY: build check default dist clean clean_buildout clean_eggs
50
61
67
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
13
13
56
14
 $ make check
14
 $ make check
57
15
15
58
16
59
16
Running
17
Running
60
17
-------
18
-------
61
18
19
64
19
Make sure that the buildout-generated bin/ directory containing the txlongpoll
20
Make sure that the buildout-generated bin/ directory containing the
65
20
executable is in the PATH or the fixture won't find it.
21
txlongpoll executable is in the PATH, or specify an absolute path
66
22
with txlongpoll_bin, otherwise the fixture won't find it.
67
21
23
68
22
Example usage:
24
Example usage:
69
23
25
70
24
 >>> class MyTest(testtools.TestCase):
26
 >>> class MyTest(testtools.TestCase):
76
25
 ...     fixture = TxLongPollFixture(
27
 ...     def test_thingy(self):
77
26
 ...         broker_user="guest", broker_password="guest", frontend_port=9999,
28
 ...         fixture = TxLongPollFixture(
78
27
 ...         broker_vhost="/", broker_host="localhost", broker_port=5672,
29
 ...             frontend_port=9999, broker_user="guest",
79
28
 ...         txlongpoll_bin="txlongpoll")
30
 ...             broker_password="guest", broker_vhost="/",
80
29
 ...     self.useFixture()
31
 ...             broker_host="localhost", broker_port=5672,
81
32
 ...             txlongpoll_bin="txlongpoll")
82
33
 ...         self.useFixture(fixture)
83
30
34
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
6
6
90
7
setup(
7
setup(
91
8
    name='txlongpollfixture',
8
    name='txlongpollfixture',
93
9
    version="0.1",
9
    version="0.1.1",
94
10
    packages=find_packages('.'),
10
    packages=find_packages('.'),
95
11
    package_dir={'': '.'},
11
    package_dir={'': '.'},
96
12
    include_package_data=True,
12
    include_package_data=True,
Status:	Merged
Approved by:	Julian Edwards on 2011-09-27
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
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Julian Edwards (community)			Approve on 2011-09-27
Raphaël Badin (community)	code*	2011-09-27	Approve on 2011-09-27
Review via email: mp+77182@code.launchpad.net