Skip to content

Commit e0c45ff

Browse files
committed
Add object type and ID to message prefix in fixtures output for easier debugging
1 parent c11ff04 commit e0c45ff

File tree

1 file changed

+21
-15
lines changed

1 file changed

+21
-15
lines changed

test/fixtures.py

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,12 @@ def __init__(self, host, port):
208208
self.tmp_dir = None
209209
self.child = None
210210

211+
def out(self, message):
212+
print("*** Zookeeper[%s]: %s" % (id(self), message))
213+
211214
def open(self):
212215
self.tmp_dir = tempfile.mkdtemp()
213-
print("*** Running local Zookeeper instance...")
216+
print("*** [%s] Running local Zookeeper instance..." % id(self))
214217
print(" host = %s" % self.host)
215218
print(" port = %s" % self.port)
216219
print(" tmp_dir = %s" % self.tmp_dir)
@@ -229,16 +232,16 @@ def open(self):
229232
self.child.configure_stderr(os.path.join(self.tmp_dir, "stderr.txt"))
230233

231234
# Party!
232-
print("*** Starting Zookeeper...")
235+
self.out("Starting...")
233236
self.child.start()
234237
self.child.wait_for(r"Snapshotting")
235-
print("*** Done!")
238+
self.out("Done!")
236239

237240
def close(self):
238-
print("*** Stopping Zookeeper...")
241+
self.out("Stopping...")
239242
self.child.stop()
240243
self.child = None
241-
print("*** Done!")
244+
self.out("Done!")
242245
shutil.rmtree(self.tmp_dir)
243246

244247

@@ -274,13 +277,16 @@ def __init__(self, host, port, broker_id, zk_host, zk_port, zk_chroot, replicas=
274277
self.child = None
275278
self.running = False
276279

280+
def out(self, message):
281+
print("*** Kafka[%s]: %s" % (id(self), message))
282+
277283
def open(self):
278284
if self.running:
279-
print("*** Kafka instance already running")
285+
self.out("Instance already running")
280286
return
281287

282288
self.tmp_dir = tempfile.mkdtemp()
283-
print("*** Running local Kafka instance")
289+
self.out("Running local instance")
284290
print(" host = %s" % self.host)
285291
print(" port = %s" % self.port)
286292
print(" broker_id = %s" % self.broker_id)
@@ -308,31 +314,31 @@ def open(self):
308314
self.child.configure_stderr(os.path.join(self.tmp_dir, "stderr.txt"))
309315

310316
# Party!
311-
print("*** Creating Zookeeper chroot node...")
317+
self.out("Creating Zookeeper chroot node...")
312318
proc = subprocess.Popen(kafka_run_class_args(
313319
"org.apache.zookeeper.ZooKeeperMain",
314320
"-server", "%s:%d" % (self.zk_host, self.zk_port),
315321
"create", "/%s" % self.zk_chroot, "kafka-python"
316322
))
317323
if proc.wait() != 0:
318-
print("*** Failed to create Zookeeper chroot node")
324+
self.out("Failed to create Zookeeper chroot node")
319325
raise RuntimeError("Failed to create Zookeeper chroot node")
320-
print("*** Done!")
326+
self.out("Done!")
321327

322-
print("*** Starting Kafka...")
328+
self.out("Starting...")
323329
self.child.start()
324330
self.child.wait_for(r"\[Kafka Server %d\], Started" % self.broker_id)
325-
print("*** Done!")
331+
self.out("Done!")
326332
self.running = True
327333

328334
def close(self):
329335
if not self.running:
330-
print("*** Kafka instance already stopped")
336+
self.out("Instance already stopped")
331337
return
332338

333-
print("*** Stopping Kafka...")
339+
self.out("Stopping...")
334340
self.child.stop()
335341
self.child = None
336-
print("*** Done!")
342+
self.out("Done!")
337343
shutil.rmtree(self.tmp_dir)
338344
self.running = False

0 commit comments

Comments
 (0)