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