diff options
author | Christian Grothoff <christian@grothoff.org> | 2010-07-07 06:27:10 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2010-07-07 06:27:10 +0000 |
commit | ac2de52a5de68f6f4f13b7aa01a481869fffc6aa (patch) | |
tree | 856c9f0b2f55f8cae99f3c7b3bf22beaecbf58da /src/peerinfo-tool/test_gnunet_peerinfo.py.in | |
parent | c1a3c11f8665432d9db6d549c28c0329668e66af (diff) | |
download | gnunet-ac2de52a5de68f6f4f13b7aa01a481869fffc6aa.tar.gz gnunet-ac2de52a5de68f6f4f13b7aa01a481869fffc6aa.zip |
hacks from trip
Diffstat (limited to 'src/peerinfo-tool/test_gnunet_peerinfo.py.in')
-rwxr-xr-x | src/peerinfo-tool/test_gnunet_peerinfo.py.in | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/peerinfo-tool/test_gnunet_peerinfo.py.in b/src/peerinfo-tool/test_gnunet_peerinfo.py.in index ba542f28a..01f76aa1e 100755 --- a/src/peerinfo-tool/test_gnunet_peerinfo.py.in +++ b/src/peerinfo-tool/test_gnunet_peerinfo.py.in | |||
@@ -46,12 +46,12 @@ try: | |||
46 | os.system ('gnunet-arm -q -i transport -c test_gnunet_peerinfo_data.conf') | 46 | os.system ('gnunet-arm -q -i transport -c test_gnunet_peerinfo_data.conf') |
47 | os.system ('sleep 1') | 47 | os.system ('sleep 1') |
48 | pinfo = pexpect.spawn ('gnunet-peerinfo -c test_gnunet_peerinfo_data.conf') | 48 | pinfo = pexpect.spawn ('gnunet-peerinfo -c test_gnunet_peerinfo_data.conf') |
49 | pinfo.expect (re.compile ("Peer `.*\' with trust *0\r")); | 49 | pinfo.expect (re.compile ("Peer `.*\'\r")); |
50 | pinfo.expect (re.compile (" *localhost:24357\r")); | 50 | pinfo.expect (re.compile (" *localhost:24357\r")); |
51 | pinfo.expect (pexpect.EOF); | 51 | pinfo.expect (pexpect.EOF); |
52 | 52 | ||
53 | pinfo = pexpect.spawn ('gnunet-peerinfo -c test_gnunet_peerinfo_data.conf -n') | 53 | pinfo = pexpect.spawn ('gnunet-peerinfo -c test_gnunet_peerinfo_data.conf -n') |
54 | pinfo.expect (re.compile ("Peer `.*\' with trust *0\r")); | 54 | pinfo.expect (re.compile ("Peer `.*\'\r")); |
55 | pinfo.expect (re.compile (" *127..*:24357\r")); | 55 | pinfo.expect (re.compile (" *127..*:24357\r")); |
56 | pinfo.expect (pexpect.EOF); | 56 | pinfo.expect (pexpect.EOF); |
57 | 57 | ||
@@ -59,14 +59,6 @@ try: | |||
59 | pid = pinfo.read (-1) | 59 | pid = pinfo.read (-1) |
60 | pid = pid.strip () | 60 | pid = pid.strip () |
61 | 61 | ||
62 | pinfo = pexpect.spawn ('gnunet-peerinfo -c test_gnunet_peerinfo_data.conf 4 ' + pid) | ||
63 | pinfo.expect (re.compile ("Peer `" + pid + "\' with trust *4\r")); | ||
64 | pinfo.expect (pexpect.EOF); | ||
65 | |||
66 | pinfo = pexpect.spawn ('gnunet-peerinfo -c test_gnunet_peerinfo_data.conf -- -4 ' + pid) | ||
67 | pinfo.expect (re.compile ("Peer `" + pid + "\' with trust *0\r")); | ||
68 | pinfo.expect (pexpect.EOF); | ||
69 | |||
70 | finally: | 62 | finally: |
71 | os.system ('gnunet-arm -c test_gnunet_peerinfo_data.conf -eq') | 63 | os.system ('gnunet-arm -c test_gnunet_peerinfo_data.conf -eq') |
72 | os.system ('rm -rf /tmp/gnunet-test-peerinfo/') | 64 | os.system ('rm -rf /tmp/gnunet-test-peerinfo/') |