diff options
author | LRN <lrn1986@gmail.com> | 2012-07-22 13:47:14 +0000 |
---|---|---|
committer | LRN <lrn1986@gmail.com> | 2012-07-22 13:47:14 +0000 |
commit | 3e578a363db4b1b5840c06a9ac2ac54a68fb6657 (patch) | |
tree | 8ec86a2a71759f4cf0de97043aa5343cc68c3fc9 /src/fs/test_gnunet_fs_rec.py.in | |
parent | a669108f0f2d602bfea9c7a8132fb761388493ad (diff) | |
download | gnunet-3e578a363db4b1b5840c06a9ac2ac54a68fb6657.tar.gz gnunet-3e578a363db4b1b5840c06a9ac2ac54a68fb6657.zip |
Use Python batteries in fs_rec test
Diffstat (limited to 'src/fs/test_gnunet_fs_rec.py.in')
-rwxr-xr-x | src/fs/test_gnunet_fs_rec.py.in | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in index e86bb0ab2..09e55c144 100755 --- a/src/fs/test_gnunet_fs_rec.py.in +++ b/src/fs/test_gnunet_fs_rec.py.in | |||
@@ -23,6 +23,9 @@ import os | |||
23 | import subprocess | 23 | import subprocess |
24 | import re | 24 | import re |
25 | import shutil | 25 | import shutil |
26 | import tarfile | ||
27 | import filecmp | ||
28 | import pydiffer | ||
26 | 29 | ||
27 | srcdir = "../.." | 30 | srcdir = "../.." |
28 | gnunet_pyexpect_dir = os.path.join (srcdir, "contrib") | 31 | gnunet_pyexpect_dir = os.path.join (srcdir, "contrib") |
@@ -30,6 +33,7 @@ if gnunet_pyexpect_dir not in sys.path: | |||
30 | sys.path.append (gnunet_pyexpect_dir) | 33 | sys.path.append (gnunet_pyexpect_dir) |
31 | 34 | ||
32 | from gnunet_pyexpect import pexpect | 35 | from gnunet_pyexpect import pexpect |
36 | from pydiffer import dcdiff | ||
33 | 37 | ||
34 | if os.name == 'posix': | 38 | if os.name == 'posix': |
35 | download = 'gnunet-download' | 39 | download = 'gnunet-download' |
@@ -55,7 +59,8 @@ arm = subprocess.Popen ([gnunetarm, '-sq', '-c', 'test_gnunet_fs_rec_data.conf'] | |||
55 | arm.communicate () | 59 | arm.communicate () |
56 | 60 | ||
57 | # pray that `tar' is in PATH | 61 | # pray that `tar' is in PATH |
58 | os.system ('tar xfz test_gnunet_fs_rec_data.tgz') | 62 | tar = tarfile.open ('test_gnunet_fs_rec_data.tgz') |
63 | tar.extractall () | ||
59 | # first, basic publish-search-download run | 64 | # first, basic publish-search-download run |
60 | try: | 65 | try: |
61 | pub = pexpect () | 66 | pub = pexpect () |
@@ -93,8 +98,9 @@ try: | |||
93 | 98 | ||
94 | os.remove ("rdir/b.gnd") | 99 | os.remove ("rdir/b.gnd") |
95 | os.remove ("rdir/a.gnd") | 100 | os.remove ("rdir/a.gnd") |
96 | if 0 != os.system ("diff -r dir rdir"): | 101 | diff = dcdiff ('dir', 'rdir') |
97 | raise Exception ("Unexpected difference between source directory and downloaded result") | 102 | if len (diff) != 0: |
103 | raise Exception ("Unexpected difference between source directory and downloaded result:\n{}".format (diff)) | ||
98 | 104 | ||
99 | 105 | ||
100 | finally: | 106 | finally: |