Generate realistic test coverage data by not including ipfshttpclient before the test system is started

Author: ntninja

test/run-tests.py

@@ -2,6 +2,7 @@
 from __future__ import print_function
 
 import contextlib
+import locale
 import pathlib
 import os
 import random
@@ -10,7 +11,7 @@
 import sys
 import time
 
-import ipfshttpclient
+import six
 
 
 if not hasattr(contextlib, "suppress"):
@@ -74,8 +75,17 @@ def _contextlib_suppress(*exceptions):
 # Start daemon #
 ################
 
+#PY2: Only add `encoding` parameter on Python 3 as it's not available on Unicode-hostile versions
+extra_args = {}
+if not six.PY2:
+	extra_args["encoding"] = locale.getpreferredencoding()
+
 # Spawn IPFS daemon in data directory
-DAEMON = subprocess.Popen(["ipfs", "daemon", "--enable-pubsub-experiment"])
+DAEMON = subprocess.Popen(["ipfs", "daemon", "--enable-pubsub-experiment"],
+		stdout = subprocess.PIPE,
+		stderr = subprocess.STDOUT,
+		**extra_args
+)
 os.environ["PY_IPFS_HTTP_CLIENT_TEST_DAEMON_PID"] = str(DAEMON.pid)
 
 # Collect the exit code of `DAEMON` when `SIGCHLD` is received
@@ -85,13 +95,13 @@ def _contextlib_suppress(*exceptions):
 	signal.signal(signal.SIGCHLD, lambda *a: DAEMON.poll())
 
 # Wait for daemon to start up
-while True:
-	try:
-		ipfshttpclient.connect(HOST, PORT)
-	except ipfshttpclient.exceptions.ConnectionError:
-		time.sleep(0.05)
-	else:
+#PY2: Using `for line in DAEMON.stdout` hangs the process
+line = DAEMON.stdout.readline()
+while line is not None:
+	print(line, end="")
+	if line.strip() == "Daemon is ready":
 		break
+	line = DAEMON.stdout.readline()
 
 
 ##################
@@ -121,5 +131,11 @@ def _contextlib_suppress(*exceptions):
 		DAEMON.kill()
 
 		print("IPFS daemon was still running after test!", file=sys.stderr)
+	
+	output = list(DAEMON.stdout)
+	if output:
+		print("IPFS daemon printed extra messages:", file=sys.stderr)
+		for line in output:
+			print("\t{0}".format(line), end="", file=sys.stderr)
 
 sys.exit(PYTEST_CODE)