[GNUnet-SVN] r28511 - gnunet/src/fs

[gnunet]

Author: grothoff
Date: 2013-08-12 00:33:46 +0200 (Mon, 12 Aug 2013)
New Revision: 28511

Modified:
   gnunet/src/fs/test_gnunet_fs_ns.py.in
   gnunet/src/fs/test_gnunet_fs_psd.py.in
Log:
-use ms for timeout, not us

Modified: gnunet/src/fs/test_gnunet_fs_ns.py.in
===================================================================
--- gnunet/src/fs/test_gnunet_fs_ns.py.in       2013-08-11 22:28:48 UTC (rev 
28510)
+++ gnunet/src/fs/test_gnunet_fs_ns.py.in       2013-08-11 22:33:46 UTC (rev 
28511)
@@ -60,7 +60,7 @@
   pseu.spawn (None, [pseudonym, '-c', 'test_gnunet_fs_ns_data.conf', '-A', 
'licenses', '-k', 'gplad', '-m', 'description:Free Software Licenses', '-R', 
'myroot'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
 
   s = pexpect ()
-  s.spawn (None, [search, '-V', '-t', '1000', '-N', '1', '-c', 
'test_gnunet_fs_ns_data.conf', 'gplad'], stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT)
+  s.spawn (None, [search, '-V', '-t', '1000 ms', '-N', '1', '-c', 
'test_gnunet_fs_ns_data.conf', 'gplad'], stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT)
   s.expect ("stdout", re.compile (r'#0:\r?\n'))
   s.expect ("stdout", re.compile (r'gnunet-download 
gnunet://fs/sks/.*/myroot\r?\n'))
   s.expect ("stdout", re.compile (r'\s*description: Free Software 
Licenses\r?\n'))

Modified: gnunet/src/fs/test_gnunet_fs_psd.py.in
===================================================================
--- gnunet/src/fs/test_gnunet_fs_psd.py.in      2013-08-11 22:28:48 UTC (rev 
28510)
+++ gnunet/src/fs/test_gnunet_fs_psd.py.in      2013-08-11 22:33:46 UTC (rev 
28511)
@@ -60,7 +60,7 @@
   pub.expect ("stdout", re.compile (r"URI is 
`gnunet://fs/chk/2VKHJMR74CB6GB1GFJNOO95BTINA2PEO25FL48GAS7SPBMA0GDEK5U74R1VIHK0LA6919QRS376BHQFDOE3OUP0JOU92K1NIRJMHFCO\.FPEBEAL6HCABM5LMFNNJOPPLKAF5TLUC86A11EIS1HLMIUBP8VEUTU7FT50OLF9ESKP7GTBUE7GDN392J2VKL6JKM1VT1KB4C7Q1U48\.17822'\.\r?\n"))
 
   s = pexpect ()
-  s.spawn (None, [search, '-V', '-t', '1000', '-N', '1', '-c', 
'test_gnunet_fs_psd_data.conf', 'tst'], stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT)
+  s.spawn (None, [search, '-V', '-t', '1000 ms', '-N', '1', '-c', 
'test_gnunet_fs_psd_data.conf', 'tst'], stdout=subprocess.PIPE, 
stderr=subprocess.STDOUT)
   s.expect ("stdout", re.compile (r'#0:\r?\n'))
   s.expect ("stdout", re.compile (r'gnunet-download -o 
"test_gnunet_fs_rec_data.tgz" 
gnunet://fs/chk/2VKHJMR74CB6GB1GFJNOO95BTINA2PEO25FL48GAS7SPBMA0GDEK5U74R1VIHK0LA6919QRS376BHQFDOE3OUP0JOU92K1NIRJMHFCO\.FPEBEAL6HCABM5LMFNNJOPPLKAF5TLUC86A11EIS1HLMIUBP8VEUTU7FT50OLF9ESKP7GTBUE7GDN392J2VKL6JKM1VT1KB4C7Q1U48\.17822\r?\n'))
   s.expect ("stdout", re.compile (r"\s*description: Test archive\r?\n"))