- update default values, eliminate obsolete ones

[oweals/gnunet.git] / src / peerinfo-tool / test_gnunet_peerinfo.py.in

diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py.in b/src/peerinfo-tool/test_gnunet_peerinfo.py.in
index 4a99b89ec0350b5e33d77b9e12fca560fb7f18a2..97fb5dfa5aad9b729e46264540569b52fc02d58d 100755 (executable)
--- a/src/peerinfo-tool/test_gnunet_peerinfo.py.in
+++ b/src/peerinfo-tool/test_gnunet_peerinfo.py.in
@@ -43,7 +43,7 @@ elif os.name == 'nt':
 
 pinfo = pexpect ()
 pinfo.spawn (None, [peerinfo, '-i', '-c', 'test_gnunet_peerinfo_data.conf', '-L', 'ERROR'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-pinfo.expect ("stdout", re.compile (r'Error in communication with PEERINFO service: Timeout transmitting iteration request to `PEERINFO\' service.\r?\n'))
+pinfo.expect ("stdout", re.compile (r'Service `peerinfo\' is not running, please start GNUnet\r?\n'))
 pinfo.expect ("stdout", "EOF")
 
 
@@ -64,7 +64,7 @@ try:
   pinfo.expect ("stdout", re.compile (r'I am peer `.*\'.\r?\n'))
 
   pinfo.spawn (None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf', '-qs'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-  pinfo.expect ("stdout", re.compile (r'.......................................................................................................\r?\n'))
+  pinfo.expect ("stdout", re.compile (r'....................................................\r?\n'))
 
   pinfo.spawn (None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf', 'invalid'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
   pinfo.expect ("stdout", re.compile (r'Invalid command line argument `invalid\'\r?\n'))
@@ -88,7 +88,7 @@ try:
   pinfo.spawn (None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf', '-qs'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
   pid = pinfo.read ("stdout")
   pid.strip ()
-  
+
 finally:
   arm = subprocess.Popen ([gnunetarm, '-eq', '-c', 'test_gnunet_peerinfo_data.conf'])
   arm.communicate ()