aboutsummaryrefslogtreecommitdiff
path: root/src/dht/test_dht_tools.py.in
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2014-12-16 23:11:45 +0000
committerChristian Grothoff <christian@grothoff.org>2014-12-16 23:11:45 +0000
commit627862924d8dceb768b6eb7fc6005cda5f888b3a (patch)
treecd36e2c8a8b9384ed7f8d05a4832467adbe373a3 /src/dht/test_dht_tools.py.in
parentd3b5cece9a39bdbc3c1db2a68901938b430ec1b9 (diff)
downloadgnunet-627862924d8dceb768b6eb7fc6005cda5f888b3a.tar.gz
gnunet-627862924d8dceb768b6eb7fc6005cda5f888b3a.zip
-simplify tools test
Diffstat (limited to 'src/dht/test_dht_tools.py.in')
-rw-r--r--src/dht/test_dht_tools.py.in6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in
index 2fb611576..0f48d7f76 100644
--- a/src/dht/test_dht_tools.py.in
+++ b/src/dht/test_dht_tools.py.in
@@ -14,12 +14,10 @@ else:
14 tmp = "/tmp" 14 tmp = "/tmp"
15 15
16if os.name == 'nt': 16if os.name == 'nt':
17 pif = 'gnunet-peerinfo.exe'
18 get = './gnunet-dht-get.exe' 17 get = './gnunet-dht-get.exe'
19 put = './gnunet-dht-put.exe' 18 put = './gnunet-dht-put.exe'
20 arm = 'gnunet-arm.exe' 19 arm = 'gnunet-arm.exe'
21else: 20else:
22 pif = 'gnunet-peerinfo'
23 get = './gnunet-dht-get' 21 get = './gnunet-dht-get'
24 put = './gnunet-dht-put' 22 put = './gnunet-dht-put'
25 arm = 'gnunet-arm' 23 arm = 'gnunet-arm'
@@ -27,7 +25,6 @@ else:
27tf, tempcfg = tempfile.mkstemp (prefix='test_dht_api_peer1.') 25tf, tempcfg = tempfile.mkstemp (prefix='test_dht_api_peer1.')
28os.close (tf) 26os.close (tf)
29 27
30run_pif = [pif, '-c', tempcfg, '-sq']
31run_get = [get, '-c', tempcfg] 28run_get = [get, '-c', tempcfg]
32run_put = [put, '-c', tempcfg] 29run_put = [put, '-c', tempcfg]
33run_arm = [arm, '-c', tempcfg] 30run_arm = [arm, '-c', tempcfg]
@@ -69,9 +66,6 @@ def r_something (to_run, extra_args, failer = None, normal = True, **kw):
69def r_arm (extra_args, **kw): 66def r_arm (extra_args, **kw):
70 return r_something (run_arm, extra_args, **kw) 67 return r_something (run_arm, extra_args, **kw)
71 68
72def r_pif (extra_args, **kw):
73 return r_something (run_pif, extra_args, **kw)
74
75def r_get (extra_args, **kw): 69def r_get (extra_args, **kw):
76 return r_something (run_get, extra_args, **kw) 70 return r_something (run_get, extra_args, **kw)
77 71