import subprocess
import re
import shutil
+import tarfile
+import filecmp
srcdir = "../.."
gnunet_pyexpect_dir = os.path.join (srcdir, "contrib")
sys.path.append (gnunet_pyexpect_dir)
from gnunet_pyexpect import pexpect
+from pydiffer import dcdiff
if os.name == 'posix':
download = 'gnunet-download'
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"Scanning directory `.+[\\/]dir[\\/]'\.\r?\n"))
- # Directory listing order is undefined, so only one thing is certain - that we start with `dir/'
- pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n"))
- pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n"))
- pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n"))
- pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n"))
- pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n"))
- pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n"))
- # Same goes for publishing order - the last one is the toplevel directory
+ # 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 `.+[\\/]dir[\\/]a[\\/]INSTALL' done\.\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[\\/]a' done\.\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[\\/]b[\\/]NEWS' done\.\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[\\/]b' done\.\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[\\/]NEWS' done\.\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"))
- pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/EA6RCK9L9KEH6N9P7BI127R1A0L8C9KEQQF7UUJMS9CIDM0I2ETQ3N9H6T47JTH58I97MIPOQDNGE25Q9BJ78MLBCEDVP6QVMQ7K0U8\.8CB2RLQUS4RQTU65BQK0A8HU2DS4AJLDE1F3HP0EG1LEQ9DEPIIQA4CD2I9A9UL02INBFSG9RA9JRLPIPF2RI8O3PBSB520HAB6OAO8\.20324'\.\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 ()
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: