X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Ffs%2Ftest_gnunet_fs_rec.py.in;h=3828a65c984bd77de5d609cc2d62453b6375f65f;hb=89c5d0047e261ed7e5fabb2e771123f1707e4670;hp=0418e0ce92fa3e6f69c92eb488d3aa31e099afb2;hpb=e4452497b217960b7b1521e2b72e44db81296d51;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 0418e0ce9..3828a65c9 100755
--- a/src/fs/test_gnunet_fs_rec.py.in
+++ b/src/fs/test_gnunet_fs_rec.py.in
@@ -14,8 +14,8 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with GNUnet; see the file COPYING.  If not, write to the
-#    Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-#    Boston, MA 02111-1307, USA.
+#    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#    Boston, MA 02110-1301, USA.
 #
 # Testcase for file-sharing command-line tools (recursive publishing & download)
 import sys
@@ -23,6 +23,8 @@ import os
 import subprocess
 import re
 import shutil
+import tarfile
+import filecmp
 
 srcdir = "../.."
 gnunet_pyexpect_dir = os.path.join (srcdir, "contrib")
@@ -30,21 +32,22 @@ if gnunet_pyexpect_dir not in sys.path:
   sys.path.append (gnunet_pyexpect_dir)
 
 from gnunet_pyexpect import pexpect
+from pydiffer import dcdiff
 
 if os.name == 'posix':
-  download = 'gnunet-download'
+  download = './gnunet-download'
   gnunetarm = 'gnunet-arm'
-  publish = 'gnunet-publish'
-  unindex = 'gnunet-unindex'
-  search = 'gnunet-search'
-  directory = 'gnunet-directory'
+  publish = './gnunet-publish'
+  unindex = './gnunet-unindex'
+  search = './gnunet-search'
+  directory = './gnunet-directory'
 elif os.name == 'nt':
-  download = 'gnunet-download.exe'
+  download = './gnunet-download.exe'
   gnunetarm = 'gnunet-arm.exe'
-  publish = 'gnunet-publish.exe'
-  unindex = 'gnunet-unindex.exe'
-  search = 'gnunet-search.exe'
-  directory = 'gnunet-directory.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)
@@ -55,16 +58,34 @@ 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')
+tar = tarfile.open ('test_gnunet_fs_rec_data.tgz')
+tar.extractall ()
 # first, basic publish-search-download run
 try:
   pub = pexpect ()
   pub.spawn (None, [publish, '-c', 'test_gnunet_fs_rec_data.conf', '-d', '-k', 'testdir', 'dir/'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-  pub.expect ("stdout", re.compile (r"Publishing `dir/' done\.\r?\n"))
-  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/M2I80IUI2DM4L6G93KL15AHAO7MIMS5JKP1L3LQFVN50CT7AKRQDSF594BC9TD97JJIT3COF6B5O524CMIOG9EJO8UK1560M54JRI70\.GBRE5M4QJ7NA0QIN88FMSC78NNOQMVT5DH8FP37OIR5SGGHFEB9ESDNBRKT9PFE9N2GOI81UN8GGBR6KH9GRTV1T04JFSJURF2U0VE8\.20182'\.\r?\n"))
+  # 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', 'gnunet://fs/chk/M2I80IUI2DM4L6G93KL15AHAO7MIMS5JKP1L3LQFVN50CT7AKRQDSF594BC9TD97JJIT3COF6B5O524CMIOG9EJO8UK1560M54JRI70.GBRE5M4QJ7NA0QIN88FMSC78NNOQMVT5DH8FP37OIR5SGGHFEB9ESDNBRKT9PFE9N2GOI81UN8GGBR6KH9GRTV1T04JFSJURF2U0VE8.20182'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  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 ()
@@ -76,8 +97,9 @@ try:
 
   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")
+  diff = dcdiff ('dir', 'rdir')
+  if len (diff) != 0:
+    raise Exception ("Unexpected difference between source directory and downloaded result:\n{}".format (diff))
   
 
 finally: