-simplify tools test

[oweals/gnunet.git] / src / dht / test_dht_tools.py.in

diff --git a/src/dht/test_dht_tools.py.in b/src/dht/test_dht_tools.py.in
index 7247836613b7ede63c06a408883ddc99eaea6f3c..2fb611576229b2b47149a53c98477f25507e7efb 100644 (file)
--- a/src/dht/test_dht_tools.py.in
+++ b/src/dht/test_dht_tools.py.in
@@ -15,8 +15,8 @@ else:
 
 if os.name == 'nt':
   pif = 'gnunet-peerinfo.exe'
-  get = 'gnunet-dht-get.exe'
-  put = 'gnunet-dht-put.exe'
+  get = './gnunet-dht-get.exe'
+  put = './gnunet-dht-put.exe'
   arm = 'gnunet-arm.exe'
 else:
   pif = 'gnunet-peerinfo'
@@ -98,10 +98,6 @@ def print_only_failer (command, rc, stdo, stde, normal):
 
 shutil.copyfile ('test_dht_api_peer1.conf', tempcfg)
 
-print ("TEST: Generating hostkey...", end='')
-r_pif ([], failer = print_only_failer)
-print ("PASS")
-
 print ("TEST: Starting ARM...", end='')
 r_arm (['-s'], failer = end_arm_failer, want_stdo = False, want_stde = False)
 print ("PASS")
@@ -113,7 +109,7 @@ print ("PASS")
 time.sleep (1)
 
 print ("TEST: Testing get...", end='')
-rc, stdo, stde = r_get (['-k', 'testkey', '-T', '5', '-t', '8'], want_stdo = True, failer = end_arm_failer)
+rc, stdo, stde = r_get (['-k', 'testkey', '-T', '5 ms', '-t', '8'], want_stdo = True, failer = end_arm_failer)
 stdo = stdo.replace ('\r', '').splitlines ()
 expect = "Result 0, type 8:\ntestdata".splitlines()
 if len (stdo) != 2 or len (expect) != 2 or stdo[0] != expect[0] or stdo[1] != expect[1]: