From: Alina Quereilhac <alina.quereilhac@inria.fr>
Date: Tue, 19 Apr 2011 14:18:16 +0000 (+0200)
Subject: Added verbose flag in coverage test
X-Git-Tag: nepi_v2~144
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c34c9f443736689404f7f9e2b3b140192147c152;p=nepi.git

Added verbose flag in coverage test
---

diff --git a/Makefile b/Makefile
index afebb0b3..7f591481 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ coverage: all
 	rm -f .coverage
 	for i in `find "$(TESTDIR)" -perm -u+x -type f`; do \
 		set -e; \
-		TESTLIBPATH="$(TESTLIB)" PYTHONPATH="$(PYPATH)" $(COVERAGE) -x $$i; \
+		TESTLIBPATH="$(TESTLIB)" PYTHONPATH="$(PYPATH)" $(COVERAGE) -x $$i -v; \
 		done
 	$(COVERAGE) -c
 	$(COVERAGE) -r -m `find "$(BUILDDIR)" -name \\*.py -type f`
diff --git a/src/nepi/util/server.py b/src/nepi/util/server.py
index 36e54dc3..963ac141 100644
--- a/src/nepi/util/server.py
+++ b/src/nepi/util/server.py
@@ -298,13 +298,9 @@ class Client(object):
         # will be able to connect to it
         helo = self._process.stderr.readline()
         if helo != 'READY.\n':
-            raise AssertionError, "Expected 'Ready.', got %r" % (helo,)
+            raise AssertionError, "Expected 'Ready.', got %r: %s" % (helo,
+                    helo + self._process.stderr.read())
         
-        if self._process.poll():
-            err = self._process.stderr.read()
-            raise RuntimeError("Client could not be executed: %s" % \
-                    err)
-
     def send_msg(self, msg):
         encoded = base64.b64encode(msg)
         data = "%s\n" % encoded