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'
+ 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)
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 ()
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: