X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ftest_gnunet_fs_rec.py.in;h=e86bb0ab2b3922c2be6d8a9a59e79f433ab2d1d1;hb=34228a39153d5ba620f3e8dde666475043af194b;hp=c922d147b054386be44155b02b0d751f7bff91fb;hpb=868d5a4feadfedbf7264154dac0903806a501edd;p=oweals%2Fgnunet.git

diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in
index c922d147b..e86bb0ab2 100755
--- a/src/fs/test_gnunet_fs_rec.py.in
+++ b/src/fs/test_gnunet_fs_rec.py.in
@@ -18,36 +18,92 @@
 #    Boston, MA 02111-1307, USA.
 #
 # Testcase for file-sharing command-line tools (recursive publishing & download)
-import pexpect
+import sys
 import os
-import signal
+import subprocess
 import re
+import shutil
 
-os.system ('rm -rf /tmp/gnunet-test-fs-py-rec/')
-os.system ('gnunet-arm -sq -c test_gnunet_fs_rec_data.conf')
+srcdir = "../.."
+gnunet_pyexpect_dir = os.path.join (srcdir, "contrib")
+if gnunet_pyexpect_dir not in sys.path:
+  sys.path.append (gnunet_pyexpect_dir)
+
+from gnunet_pyexpect import pexpect
+
+if os.name == 'posix':
+  download = 'gnunet-download'
+  gnunetarm = 'gnunet-arm'
+  publish = 'gnunet-publish'
+  unindex = 'gnunet-unindex'
+  search = 'gnunet-search'
+  directory = 'gnunet-directory'
+elif os.name == 'nt':
+  download = 'gnunet-download.exe'
+  gnunetarm = 'gnunet-arm.exe'
+  publish = 'gnunet-publish.exe'
+  unindex = 'gnunet-unindex.exe'
+  search = 'gnunet-search.exe'
+  directory = 'gnunet-directory.exe'
+
+if os.name == "nt":
+  shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-rec"), True)
+else:
+  shutil.rmtree ("/tmp/gnunet-test-fs-py-rec", True)
+
+arm = subprocess.Popen ([gnunetarm, '-sq', '-c', 'test_gnunet_fs_rec_data.conf'])
+arm.communicate ()
+
+# pray that `tar' is in PATH
 os.system ('tar xfz test_gnunet_fs_rec_data.tgz')
+# first, basic publish-search-download run
 try:
-  pub = pexpect.spawn ('gnunet-publish -c test_gnunet_fs_rec_data.conf -d -k testdir dir/')
-  pub.expect ('Publishing `dir/\' done.\r')
-  pub.expect ("URI is `gnunet://fs/chk/CQI091BQ15LLC2NO5RQM2LP95D8I0ONKDFT912V8CMH3BIPDUSDKG3JL07V9E89JPJ0CG5JE9EAQLC1Q6I0VF9L8M86MO0K3DG7HA2O.NVIUL6B7AT6TIUVOV0JLIQ3LLSS3TRLCVAISDS47V0KVHN22TJ9H9247HQNA8T3KK1J32QJ65312DUQPA2EBQPNII279BU0MKJEB94G.20181'.")
-  pub.expect (pexpect.EOF)
-
-  down = pexpect.spawn ('gnunet-download -c test_gnunet_fs_rec_data.conf -R -o rdir.gnd gnunet://fs/chk/CQI091BQ15LLC2NO5RQM2LP95D8I0ONKDFT912V8CMH3BIPDUSDKG3JL07V9E89JPJ0CG5JE9EAQLC1Q6I0VF9L8M86MO0K3DG7HA2O.NVIUL6B7AT6TIUVOV0JLIQ3LLSS3TRLCVAISDS47V0KVHN22TJ9H9247HQNA8T3KK1J32QJ65312DUQPA2EBQPNII279BU0MKJEB94G.20181')
-  down.expect (re.compile ("Downloading `rdir.gnd\' done \(.*\).\r"));
-  down.expect (pexpect.EOF);
-
-  dir = pexpect.spawn ('gnunet-directory -c test_gnunet_fs_rec_data.conf  rdir/a.gnd')
-  dir.expect (re.compile ("Directory `a' summary:"));
-  dir.expect (re.compile (" *mimetype: application/gnunet-directory"));
-  dir.expect (re.compile ("COPYING (.*)"));
-  dir.expect (re.compile ("INSTALL (.*)"));
-  dir.expect (pexpect.EOF)
-
-  os.system ('rm -r rdir/b.gnd rdir/a.gnd')
-  if (0 != os.system ("diff -r dir rdir")):
+  pub = pexpect ()
+  pub.spawn (None, [publish, '-c', 'test_gnunet_fs_rec_data.conf', '-d', '-k', 'testdir', 'dir/'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  # Can't say much for publishing, except that the last one is the toplevel directory
+  pub.expect ("stdout", re.compile (r"Publishing `.+' done\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Publishing `.+' done\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Publishing `.+' done\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Publishing `.+' done\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Publishing `.+' done\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Publishing `.+' done\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Publishing `.+[\\/]dir[\\/]' done\.\r?\n"))
+  m = pub.expect ("stdout", re.compile (r".+\r?\n"))
+  if not m:
+    sys.exit (3)
+  output = m.string
+  url = output[output.find ("`")+1:output.find("'")]
+
+  down = pexpect ()
+  down.spawn (None, [download, '-c', 'test_gnunet_fs_rec_data.conf', '-R', '-o', 'rdir.gnd', url], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  down.expect ("stdout", re.compile (r"Downloading `rdir.gnd' done (.*).\r?\n"))
+
+  d = pexpect ()
+  d.spawn (None, [directory, '-c', 'test_gnunet_fs_rec_data.conf', 'rdir/a.gnd'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  d.expect ("stdout", re.compile (r"Directory `a/' meta data:\r?\n"))
+  d.expect ("stdout", re.compile (r"Directory `a/' contents:\r?\n"))
+  d.expect ("stdout", re.compile (r"COPYING (.*)\r?\n"))
+  d.expect ("stdout", re.compile (r"INSTALL (.*)\r?\n"))
+
+  os.remove ("rdir/b.gnd")
+  os.remove ("rdir/a.gnd")
+  if 0 != os.system ("diff -r dir rdir"):
     raise Exception ("Unexpected difference between source directory and downloaded result")
   
+
 finally:
-  os.system ('gnunet-arm -c test_gnunet_fs_rec_data.conf -eq')
-  os.system ('rm -r dir rdir rdir.gnd')
-  os.system ('rm -rf /tmp/gnunet-test-fs-py-rec/')
+  arm = subprocess.Popen ([gnunetarm, '-eq', '-c', 'test_gnunet_fs_rec_data.conf'])
+  arm.communicate ()
+  if os.name == "nt":
+    shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-rec"), True)
+  else:
+    shutil.rmtree ("/tmp/gnunet-test-fs-py-rec", True)
+  shutil.rmtree ("dir", True)
+  shutil.rmtree ("rdir", True)
+  shutil.rmtree ("rdir.gnd", True)