aboutsummaryrefslogtreecommitdiff
path: root/src/peerinfo-tool/test_gnunet_peerinfo.py.in
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2012-03-15 12:46:12 +0000
committerChristian Grothoff <christian@grothoff.org>2012-03-15 12:46:12 +0000
commitd9e8e70828e22f1a7f43825e460d5817d9e6e21b (patch)
tree47946135c00dc13eeea53cfd43e1ffaddb38cb36 /src/peerinfo-tool/test_gnunet_peerinfo.py.in
parentf28a2f4ecd4764362b120862e188c6893453ed2b (diff)
downloadgnunet-d9e8e70828e22f1a7f43825e460d5817d9e6e21b.tar.gz
gnunet-d9e8e70828e22f1a7f43825e460d5817d9e6e21b.zip
-fix testcase, reintroduce timeout
Diffstat (limited to 'src/peerinfo-tool/test_gnunet_peerinfo.py.in')
-rwxr-xr-xsrc/peerinfo-tool/test_gnunet_peerinfo.py.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py.in b/src/peerinfo-tool/test_gnunet_peerinfo.py.in
index ee8bc4af6..8a954641a 100755
--- a/src/peerinfo-tool/test_gnunet_peerinfo.py.in
+++ b/src/peerinfo-tool/test_gnunet_peerinfo.py.in
@@ -42,8 +42,8 @@ elif os.name == 'nt':
42 42
43 43
44pinfo = pexpect () 44pinfo = pexpect ()
45pinfo.spawn (None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf', '-L', 'ERROR'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) 45pinfo.spawn (None, [peerinfo, '-i', '-c', 'test_gnunet_peerinfo_data.conf', '-L', 'ERROR'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
46pinfo.expect ("stdout", re.compile (r'Error in communication with PEERINFO service\r?\n')) 46pinfo.expect ("stdout", re.compile (r'Error in communication with PEERINFO service: Failed to transmit iteration request to `PEERINFO\' service\r?\n'))
47pinfo.expect ("stdout", "EOF") 47pinfo.expect ("stdout", "EOF")
48 48
49if os.name == "nt": 49if os.name == "nt":
@@ -67,13 +67,13 @@ try:
67 arm.communicate () 67 arm.communicate ()
68 time.sleep (1) 68 time.sleep (1)
69 69
70 pinfo.spawn (None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) 70 pinfo.spawn (None, [peerinfo, '-i', '-c', 'test_gnunet_peerinfo_data.conf'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
71 pinfo.expect ("stdout", re.compile ("Peer `.*'\r?\n")) 71 pinfo.expect ("stdout", re.compile ("Peer `.*'\r?\n"))
72 m = pinfo.expect ("stdout", re.compile ("\s.*:24357\r?\n")) 72 m = pinfo.expect ("stdout", re.compile ("\s.*:24357\r?\n"))
73 while len (m.group (0)) > 0: 73 while len (m.group (0)) > 0:
74 m = pinfo.expect ("stdout", re.compile ("(\s.*:24357\r?\n|\r?\n|)")) 74 m = pinfo.expect ("stdout", re.compile ("(\s.*:24357\r?\n|\r?\n|)"))
75 75
76 pinfo.spawn (None, [peerinfo, '-c', 'test_gnunet_peerinfo_data.conf', '-n'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) 76 pinfo.spawn (None, [peerinfo, '-i', '-c', 'test_gnunet_peerinfo_data.conf', '-n'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
77 pinfo.expect ("stdout", re.compile ("Peer `.*'\r?\n")) 77 pinfo.expect ("stdout", re.compile ("Peer `.*'\r?\n"))
78 m = pinfo.expect ("stdout", re.compile ("\s.*:24357\r?\n")) 78 m = pinfo.expect ("stdout", re.compile ("\s.*:24357\r?\n"))
79 while len (m.group (0)) > 0: 79 while len (m.group (0)) > 0: