session time out for http client/server

[oweals/gnunet.git] / src / statistics / test_gnunet_statistics.py.in

diff --git a/src/statistics/test_gnunet_statistics.py.in b/src/statistics/test_gnunet_statistics.py.in
index b5697d246c61a6b168188511c6a4be988f51d570..a7785ba1f38e4121551bfe30cf72c9c515666b93 100644 (file)
--- a/src/statistics/test_gnunet_statistics.py.in
+++ b/src/statistics/test_gnunet_statistics.py.in
@@ -13,10 +13,10 @@ else:
   tmp = "/tmp"
 
 if os.name == 'nt':
-  st = 'gnunet-statistics.exe'
+  st = './gnunet-statistics.exe'
   arm = 'gnunet-arm.exe'
 else:
-  st = 'gnunet-statistics'
+  st = './gnunet-statistics'
   arm = 'gnunet-arm'
 
 run_st = [st, '-c', 'test_statistics_api_data.conf']
@@ -26,7 +26,7 @@ if debug:
   run_arm += [debug.split (' ')]
 
 def cleanup ():
-  shutil.rmtree (os.path.join (tmp, "test-gnunetd-statistics"), True)
+  shutil.rmtree (os.path.join (tmp, "test-gnunet-statistics"), True)
 
 def sub_run (args, want_stdo = True, want_stde = False, nofail = False):
   if want_stdo:
@@ -71,7 +71,6 @@ def restart ():
   time.sleep (1)
   t = r_arm (['-i', 'statistics'])
   time.sleep (1)
-  print ("DONE")
 
 
 cleanup ()
@@ -81,10 +80,9 @@ t = r_arm (['-s'], want_stdo = False)
 time.sleep (1)
 t = r_arm (['-i', 'statistics'], want_stdo = False)
 time.sleep (1)
-print ("DONE")
 
 print ("TEST: Bad argument checking...", end='')
-r_st (['-x'], normal = False, nofail = True, want_stdo = False)
+r_st (['-x'], normal = False, nofail = True, want_stdo = False, want_stde = True)
 print ("PASS")
 
 print ("TEST: Set value...", end='')
@@ -146,6 +144,5 @@ print ("PASS")
 print ("Stopping service...")
 t = r_arm (['-e'], want_stdo = False)
 time.sleep (1)
-print ("DONE")
 
 cleanup ()