Skip to content

Commit a61019c

Browse files
erralerral
committed
user assertTrue instead of assertIn, py26 doesn't have assertIn
1 parent 719f4af commit a61019c

File tree

2 files changed

+71
-70
lines changed

2 files changed

+71
-70
lines changed

‎superlance/tests/httpok_test.py‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,14 @@ def test_runforever_eager_error_on_request_some(self):
135135
prog.runforever(test=True)
136136
lines = prog.stderr.getvalue().split('\n')
137137
#self.assertEqual(len(lines), 7)
138-
self.assertIn("Restarting selected processes ['foo', 'bar', "
139-
"'baz_01', 'notexisting']", lines[0])
140-
self.assertIn('foo is in RUNNING state, restarting', lines[1])
141-
self.assertIn('foo restarted', lines[2])
142-
self.assertIn('bar not in RUNNING state, NOT restarting', lines[3])
143-
self.assertIn('baz:baz_01 not in RUNNING state, NOT restarting',
138+
self.assertTrue("Restarting selected processes ['foo', 'bar', "
139+
"'baz_01', 'notexisting']" in lines[0])
140+
self.assertTrue('foo is in RUNNING state, restarting' in lines[1])
141+
self.assertTrue('foo restarted' in lines[2])
142+
self.assertTrue('bar not in RUNNING state, NOT restarting' in lines[3])
143+
self.assertTrue('baz:baz_01 not in RUNNING state, NOT restarting' in
144144
lines[4])
145-
self.assertIn("Programs not restarted because "
145+
self.assertTrue("Programs not restarted because "
146146
"they did not exist: ['notexisting']", lines[5])
147147
mailed = prog.mailed.split('\n')
148148
self.assertEqual(len(mailed), 12)
@@ -159,11 +159,11 @@ def test_runforever_eager_error_on_request_any(self):
159159
prog.runforever(test=True)
160160
lines = prog.stderr.getvalue().split('\n')
161161
#self.assertEqual(len(lines), 6)
162-
self.assertIn('Restarting all running processes', lines[0])
163-
self.assertIn('foo is in RUNNING state, restarting', lines[1])
164-
self.assertIn('foo restarted', lines[2])
165-
self.assertIn('bar not in RUNNING state, NOT restarting', lines[3])
166-
self.assertIn('baz:baz_01 not in RUNNING state, NOT restarting',
162+
self.assertTrue('Restarting all running processes' in lines[0])
163+
self.assertTrue('foo is in RUNNING state, restarting' in lines[1])
164+
self.assertTrue('foo restarted' in lines[2])
165+
self.assertTrue('bar not in RUNNING state, NOT restarting' in lines[3])
166+
self.assertTrue('baz:baz_01 not in RUNNING state, NOT restarting' in
167167
lines[4])
168168
mailed = prog.mailed.split('\n')
169169
self.assertEqual(len(mailed), 11)
@@ -181,11 +181,11 @@ def test_runforever_eager_error_on_process_stop(self):
181181
prog.runforever(test=True)
182182
lines = prog.stderr.getvalue().split('\n')
183183
#self.assertEqual(len(lines), 5)
184-
self.assertIn("Restarting selected processes ['FAILED']", lines[0])
185-
self.assertIn('foo:FAILED is in RUNNING state, restarting', lines[1])
186-
self.assertIn("Failed to stop process foo:FAILED: "
187-
"<Fault 30: 'FAILED'>", lines[2])
188-
self.assertIn('foo:FAILED restarted', lines[3])
184+
self.assertTrue("Restarting selected processes ['FAILED']" in lines[0])
185+
self.assertTrue('foo:FAILED is in RUNNING state, restarting' in lines[1])
186+
self.assertTrue("Failed to stop process foo:FAILED: "
187+
"<Fault 30: 'FAILED'>" in lines[2])
188+
self.assertTrue('foo:FAILED restarted' in lines[3])
189189
mailed = prog.mailed.split('\n')
190190
self.assertEqual(len(mailed), 10)
191191
self.assertEqual(mailed[0], 'To: chrism@plope.com')
@@ -202,11 +202,11 @@ def test_runforever_eager_error_on_process_start(self):
202202
prog.runforever(test=True)
203203
lines = prog.stderr.getvalue().split('\n')
204204
#self.assertEqual(len(lines), 4)
205-
self.assertIn("Restarting selected processes ['SPAWN_ERROR']", lines[0])
206-
self.assertIn('foo:SPAWN_ERROR is in RUNNING state, restarting',
205+
self.assertTrue("Restarting selected processes ['SPAWN_ERROR']" in lines[0])
206+
self.assertTrue('foo:SPAWN_ERROR is in RUNNING state, restarting' in
207207
lines[1])
208-
self.assertIn("Failed to start process foo:SPAWN_ERROR: "
209-
"<Fault 50: 'SPAWN_ERROR'>", lines[2])
208+
self.assertTrue("Failed to start process foo:SPAWN_ERROR: "
209+
"<Fault 50: 'SPAWN_ERROR'>" in lines[2])
210210
mailed = prog.mailed.split('\n')
211211
self.assertEqual(len(mailed), 9)
212212
self.assertEqual(mailed[0], 'To: chrism@plope.com')
@@ -222,18 +222,18 @@ def test_runforever_eager_gcore(self):
222222
prog.stdin.seek(0)
223223
prog.runforever(test=True)
224224
lines = prog.stderr.getvalue().split('\n')
225-
self.assertIn("Restarting selected processes ['foo', 'bar', "
226-
"'baz_01', 'notexisting']", lines[0])
227-
self.assertIn('gcore output for foo:', lines[1])
225+
self.assertTrue("Restarting selected processes ['foo', 'bar', "
226+
"'baz_01', 'notexisting']" in lines[0])
227+
self.assertTrue('gcore output for foo:' in lines[1])
228228
self.assertEqual(lines[2], '')
229229
self.assertEqual(lines[3], ' ')
230-
self.assertIn('foo is in RUNNING state, restarting', lines[4])
231-
self.assertIn('foo restarted', lines[5])
232-
self.assertIn('bar not in RUNNING state, NOT restarting', lines[6])
233-
self.assertIn('baz:baz_01 not in RUNNING state, NOT restarting',
230+
self.assertTrue('foo is in RUNNING state, restarting' in lines[4])
231+
self.assertTrue('foo restarted' in lines[5])
232+
self.assertTrue('bar not in RUNNING state, NOT restarting' in lines[6])
233+
self.assertTrue('baz:baz_01 not in RUNNING state, NOT restarting' in
234234
lines[7])
235-
self.assertIn("Programs not restarted because they did not exist: "
236-
"['notexisting']", lines[8])
235+
self.assertTrue("Programs not restarted because they did not exist: "
236+
"['notexisting']" in lines[8])
237237
mailed = prog.mailed.split('\n')
238238
self.assertEqual(len(mailed), 15)
239239
self.assertEqual(mailed[0], 'To: chrism@plope.com')
@@ -260,10 +260,10 @@ def test_runforever_not_eager_running(self):
260260
prog.stdin.seek(0)
261261
prog.runforever(test=True)
262262
lines = [x for x in prog.stderr.getvalue().split('\n') if x]
263-
self.assertIn("Restarting selected processes ['foo', 'bar']", lines[0])
264-
self.assertIn('foo is in RUNNING state, restarting', lines[1])
265-
self.assertIn('foo restarted', lines[2])
266-
self.assertIn('bar not in RUNNING state, NOT restarting', lines[3])
263+
self.assertTrue("Restarting selected processes ['foo', 'bar']" in lines[0])
264+
self.assertTrue('foo is in RUNNING state, restarting' in lines[1])
265+
self.assertTrue('foo restarted' in lines[2])
266+
self.assertTrue('bar not in RUNNING state, NOT restarting' in lines[3])
267267
mailed = prog.mailed.split('\n')
268268
self.assertEqual(len(mailed), 10)
269269
self.assertEqual(mailed[0], 'To: chrism@plope.com')
@@ -293,10 +293,11 @@ def test_runforever_connrefused_error(self):
293293
prog.stdin.seek(0)
294294
prog.runforever(test=True)
295295
lines = [x for x in prog.stderr.getvalue().split('\n') if x]
296-
self.assertIn("Restarting selected processes ['foo', 'bar']", lines[0])
297-
self.assertIn('foo is in RUNNING state, restarting', lines[1])
298-
self.assertIn('foo restarted', lines[2])
299-
self.assertIn('bar not in RUNNING state, NOT restarting', lines[3])
296+
self.assertTrue("Restarting selected processes ['foo', 'bar']"
297+
in lines[0])
298+
self.assertTrue('foo is in RUNNING state, restarting' in lines[1])
299+
self.assertTrue('foo restarted' in lines[2])
300+
self.assertTrue('bar not in RUNNING state, NOT restarting' in lines[3])
300301
mailed = prog.mailed.split('\n')
301302
self.assertEqual(len(mailed), 10)
302303
self.assertEqual(mailed[0], 'To: chrism@plope.com')

‎superlance/tests/memmon_test.py‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ def test_runforever_tick_programs(self):
4747
memmon.runforever(test=True)
4848
lines = memmon.stderr.getvalue().split('\n')
4949
self.assertEqual(len(lines), 8)
50-
self.assertIn('Checking programs bar=0, baz_01=0, foo=0', lines[0])
51-
self.assertIn('RSS of foo:foo is 2264064', lines[1])
52-
self.assertIn('Restarting foo:foo', lines[2])
53-
self.assertIn('RSS of bar:bar is 2265088', lines[3])
54-
self.assertIn('Restarting bar:bar', lines[4])
55-
self.assertIn('RSS of baz:baz_01 is 2265088', lines[5])
56-
self.assertIn('Restarting baz:baz_01', lines[6])
50+
self.assertTrue('Checking programs bar=0, baz_01=0, foo=0' in lines[0])
51+
self.assertTrue('RSS of foo:foo is 2264064' in lines[1])
52+
self.assertTrue('Restarting foo:foo' in lines[2])
53+
self.assertTrue('RSS of bar:bar is 2265088' in lines[3])
54+
self.assertTrue('Restarting bar:bar' in lines[4])
55+
self.assertTrue('RSS of baz:baz_01 is 2265088' in lines[5])
56+
self.assertTrue('Restarting baz:baz_01' in lines[6])
5757
self.assertEqual(lines[7], '')
5858
mailed = memmon.mailed.split('\n')
5959
self.assertEqual(len(mailed), 4)
@@ -73,9 +73,9 @@ def test_runforever_tick_groups(self):
7373
memmon.runforever(test=True)
7474
lines = memmon.stderr.getvalue().split('\n')
7575
self.assertEqual(len(lines), 4)
76-
self.assertIn('Checking groups foo=0', lines[0])
77-
self.assertIn('RSS of foo:foo is 2264064', lines[1])
78-
self.assertIn('Restarting foo:foo', lines[2])
76+
self.assertTrue('Checking groups foo=0' in lines[0])
77+
self.assertTrue('RSS of foo:foo is 2264064' in lines[1])
78+
self.assertTrue('Restarting foo:foo' in lines[2])
7979
self.assertEqual(lines[3], '')
8080
mailed = memmon.mailed.split('\n')
8181
self.assertEqual(len(mailed), 4)
@@ -95,13 +95,13 @@ def test_runforever_tick_any(self):
9595
memmon.runforever(test=True)
9696
lines = memmon.stderr.getvalue().split('\n')
9797
self.assertEqual(len(lines), 8)
98-
self.assertIn('Checking any=0', lines[0])
99-
self.assertIn('RSS of foo:foo is 2264064', lines[1])
100-
self.assertIn('Restarting foo:foo', lines[2])
101-
self.assertIn('RSS of bar:bar is 2265088', lines[3])
102-
self.assertIn('Restarting bar:bar', lines[4])
103-
self.assertIn('RSS of baz:baz_01 is 2265088', lines[5])
104-
self.assertIn('Restarting baz:baz_01', lines[6])
98+
self.assertTrue('Checking any=0' in lines[0])
99+
self.assertTrue('RSS of foo:foo is 2264064' in lines[1])
100+
self.assertTrue('Restarting foo:foo' in lines[2])
101+
self.assertTrue('RSS of bar:bar is 2265088' in lines[3])
102+
self.assertTrue('Restarting bar:bar' in lines[4])
103+
self.assertTrue('RSS of baz:baz_01 is 2265088' in lines[5])
104+
self.assertTrue('Restarting baz:baz_01' in lines[6])
105105
self.assertEqual(lines[7], '')
106106
mailed = memmon.mailed.split('\n')
107107
self.assertEqual(len(mailed), 4)
@@ -116,12 +116,12 @@ def test_runforever_tick_programs_and_groups(self):
116116
memmon.runforever(test=True)
117117
lines = memmon.stderr.getvalue().split('\n')
118118
self.assertEqual(len(lines), 7)
119-
self.assertIn('Checking programs baz_01=0', lines[0])
120-
self.assertIn('Checking groups foo=0', lines[1])
121-
self.assertIn('RSS of foo:foo is 2264064', lines[2])
122-
self.assertIn('Restarting foo:foo', lines[3])
123-
self.assertIn('RSS of baz:baz_01 is 2265088', lines[4])
124-
self.assertIn('Restarting baz:baz_01', lines[5])
119+
self.assertTrue('Checking programs baz_01=0' in lines[0])
120+
self.assertTrue('Checking groups foo=0' in lines[1])
121+
self.assertTrue('RSS of foo:foo is 2264064' in lines[2])
122+
self.assertTrue('Restarting foo:foo' in lines[3])
123+
self.assertTrue('RSS of baz:baz_01 is 2265088' in lines[4])
124+
self.assertTrue('Restarting baz:baz_01' in lines[5])
125125
self.assertEqual(lines[6], '')
126126
mailed = memmon.mailed.split('\n')
127127
self.assertEqual(len(mailed), 4)
@@ -141,8 +141,8 @@ def test_runforever_tick_programs_norestart(self):
141141
memmon.runforever(test=True)
142142
lines = memmon.stderr.getvalue().split('\n')
143143
self.assertEqual(len(lines), 3)
144-
self.assertIn('Checking programs foo=%s' % maxint, lines[0])
145-
self.assertIn('RSS of foo:foo is 2264064', lines[1])
144+
self.assertTrue('Checking programs foo=%s' % maxint in lines[0])
145+
self.assertTrue('RSS of foo:foo is 2264064' in lines[1])
146146
self.assertEqual(lines[2], '')
147147
self.assertEqual(memmon.mailed, False)
148148

@@ -156,8 +156,8 @@ def test_stopprocess_fault_tick_programs_norestart(self):
156156
memmon.runforever(test=True)
157157
lines = memmon.stderr.getvalue().split('\n')
158158
self.assertEqual(len(lines), 3)
159-
self.assertIn('Checking programs foo=%s' % maxint, lines[0])
160-
self.assertIn('RSS of foo:foo is 2264064', lines[1])
159+
self.assertTrue('Checking programs foo=%s' % maxint in lines[0])
160+
self.assertTrue('RSS of foo:foo is 2264064' in lines[1])
161161
self.assertEqual(lines[2], '')
162162
self.assertEqual(memmon.mailed, False)
163163

@@ -185,17 +185,17 @@ def test_stopprocess_fails_to_stop(self):
185185
self.assertRaises(xmlrpclib.Fault, memmon.runforever, True)
186186
lines = memmon.stderr.getvalue().split('\n')
187187
self.assertEqual(len(lines), 4)
188-
self.assertIn('Checking programs BAD_NAME=%s' % 0, lines[0])
189-
self.assertIn('RSS of BAD_NAME:BAD_NAME is 2264064', lines[1])
190-
self.assertIn('Restarting BAD_NAME:BAD_NAME', lines[2])
191-
self.assertIn('Failed', lines[3])
188+
self.assertTrue('Checking programs BAD_NAME=%s' % 0 in lines[0])
189+
self.assertTrue('RSS of BAD_NAME:BAD_NAME is 2264064' in lines[1])
190+
self.assertTrue('Restarting BAD_NAME:BAD_NAME' in lines[2])
191+
self.assertTrue('Failed' in lines[3])
192192
mailed = memmon.mailed.split('\n')
193193
self.assertEqual(len(mailed), 4)
194194
self.assertEqual(mailed[0], 'To: chrism@plope.com')
195195
self.assertEqual(mailed[1],
196196
'Subject: memmon [test]: failed to stop process BAD_NAME:BAD_NAME, exiting')
197197
self.assertEqual(mailed[2], '')
198-
self.assertIn('Failed', mailed[3])
198+
self.assertTrue('Failed' in mailed[3])
199199

200200
def test_subject_no_name(self):
201201
"""set the name to None to check if subject

0 commit comments

Comments
 (0)