From: Christian Grothoff Date: Fri, 5 Aug 2011 21:16:35 +0000 (+0000) Subject: LRN: 0005-Port-old-pexpect-tests-to-gnunet_pyexpect.patch X-Git-Tag: initial-import-from-subversion-38251~17448 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cb41db74f56afaa480d834c4756ecb6ac6bf8258;p=oweals%2Fgnunet.git LRN: 0005-Port-old-pexpect-tests-to-gnunet_pyexpect.patch --- diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in index c97ffd883..b579ab863 100755 --- a/src/fs/test_gnunet_fs_idx.py.in +++ b/src/fs/test_gnunet_fs_idx.py.in @@ -18,28 +18,57 @@ # Boston, MA 02111-1307, USA. # # Testcase for file-sharing command-line tools (indexing and unindexing) -import pexpect +import sys import os -import signal +import subprocess import re +import shutil + +srcdir = "../.." +gnunet_pyexpect_dir = os.path.join (srcdir, "contrib", "gnunet_pyexpect") +if gnunet_pyexpect_dir not in sys.path: + sys.path.append (gnunet_pyexpect_dir) + +from gnunet_pyexpect import pexpect + +if os.name == 'posix': + download = 'gnunet-download' + gnunetarm = 'gnunet-arm' + publish = 'gnunet-publish' + unindex = 'gnunet-unindex' +elif os.name == 'nt': + download = 'gnunet-download.exe' + gnunetarm = 'gnunet-arm.exe' + publish = 'gnunet-publish.exe' + unindex = 'gnunet-unindex.exe' + +if os.name == "nt": + shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-idx"), True) +else: + shutil.rmtree ("/tmp/gnunet-test-fs-py-idx", True) + +arm = subprocess.Popen ([gnunetarm, '-sq', '-c', 'test_gnunet_fs_idx_data.conf']) +arm.communicate () -os.system ('rm -rf /tmp/gnunet-test-fs-py-idx/') -os.system ('gnunet-arm -sq -c test_gnunet_fs_idx_data.conf') try: - pub = pexpect.spawn ('gnunet-publish -c test_gnunet_fs_idx_data.conf -m "description:The GNU Public License" -k gpl ../../COPYING') - pub.expect ('Publishing `../../COPYING\' done.\r') - pub.expect ("URI is `gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147'.\r") - pub.expect (pexpect.EOF) + pub = pexpect () + pub.spawn (None, [publish, '-c', 'test_gnunet_fs_idx_data.conf', '-m', "description:The GNU Public License", '-k', 'gpl', '../../COPYING'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + pub.expect ("stdout", re.compile (r"Publishing `\.\./\.\./COPYING' done\.\r?\n")) + pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O\.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG\.35147'\.\r?\n")) - down = pexpect.spawn ('gnunet-download -c test_gnunet_fs_idx_data.conf -o COPYING gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147') - down.expect (re.compile ("Downloading `COPYING\' done \(.*\).\r")); - down.expect (pexpect.EOF); - os.system ('rm COPYING'); + down = pexpect () + down.spawn (None, [download, '-c', 'test_gnunet_fs_idx_data.conf', '-o', 'COPYING', 'gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + down.expect ("stdout", re.compile (r"Downloading `COPYING' done (.*).\r?\n")) + os.remove ("COPYING") - unindex = pexpect.spawn ('gnunet-unindex -c test_gnunet_fs_idx_data.conf ../../COPYING') - unindex.expect ('Unindexing done.\r') - unindex.expect (pexpect.EOF) + un = pexpect () + un.spawn (None, [unindex, '-c', 'test_gnunet_fs_idx_data.conf', '../../COPYING'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + un.expect ("stdout", re.compile (r'Unindexing done\.\r?\n')) finally: - os.system ('gnunet-arm -c test_gnunet_fs_idx_data.conf -eq') - os.system ('rm -rf /tmp/gnunet-test-fs-py-idx/') + arm = subprocess.Popen ([gnunetarm, '-eq', '-c', 'test_gnunet_fs_idx_data.conf']) + arm.communicate () + if os.name == "nt": + shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-idx"), True) + else: + shutil.rmtree ("/tmp/gnunet-test-fs-py-idx", True) diff --git a/src/fs/test_gnunet_fs_ns.py.in b/src/fs/test_gnunet_fs_ns.py.in index b72bc9062..b6a695c7f 100755 --- a/src/fs/test_gnunet_fs_ns.py.in +++ b/src/fs/test_gnunet_fs_ns.py.in @@ -18,33 +18,63 @@ # Boston, MA 02111-1307, USA. # # Testcase for file-sharing command-line tools (namespaces) -import pexpect +import sys import os -import signal +import subprocess import re +import shutil + +srcdir = "../.." +gnunet_pyexpect_dir = os.path.join (srcdir, "contrib", "gnunet_pyexpect") +if gnunet_pyexpect_dir not in sys.path: + sys.path.append (gnunet_pyexpect_dir) + +from gnunet_pyexpect import pexpect + +if os.name == 'posix': + pseudonym = 'gnunet-pseudonym' + gnunetarm = 'gnunet-arm' + publish = 'gnunet-publish' + unindex = 'gnunet-unindex' + search = 'gnunet-search' +elif os.name == 'nt': + pseudonym = 'gnunet-pseudonym.exe' + gnunetarm = 'gnunet-arm.exe' + publish = 'gnunet-publish.exe' + unindex = 'gnunet-unindex.exe' + search = 'gnunet-search.exe' + +if os.name == "nt": + shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True) +else: + shutil.rmtree ("/tmp/gnunet-test-fs-py-ns", True) + +arm = subprocess.Popen ([gnunetarm, '-sq', '-c', 'test_gnunet_fs_ns_data.conf']) +arm.communicate () -os.system ('rm -rf /tmp/gnunet-test-fs-py-ns/') -os.system ('gnunet-arm -sq -c test_gnunet_fs_ns_data.conf') try: - pseu = pexpect.spawn ('gnunet-pseudonym -c test_gnunet_fs_ns_data.conf -C licenses -k gplad -m "description:Free Software Licenses" -R myroot') - pseu.expect (pexpect.EOF) - pseu = pexpect.spawn ('gnunet-pseudonym -c test_gnunet_fs_ns_data.conf -o') - pseu.expect (re.compile("licenses \(.*\)\r")) - pseu.expect (pexpect.EOF) + pseu = pexpect () + pseu.spawn (None, [pseudonym, '-c', 'test_gnunet_fs_ns_data.conf', '-C', 'licenses', '-k', 'gplad', '-m', 'description:Free Software Licenses', '-R', 'myroot'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + pseu.spawn (None, [pseudonym, '-c', 'test_gnunet_fs_ns_data.conf', '-o'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + pseu.expect ("stdout", re.compile (r"licenses (.*)\r?\n")) - pub = pexpect.spawn ('gnunet-publish -c test_gnunet_fs_ns_data.conf -k licenses -P licenses -u gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147 -t gpl -N gpl3') - pub.expect (pexpect.EOF) + pub = pexpect () + pub.spawn (None, [publish, '-c', 'test_gnunet_fs_ns_data.conf', '-k', 'licenses', '-P', 'licenses', '-u', 'gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147', '-t', 'gpl', '-N', 'gpl3'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - search = pexpect.spawn ('gnunet-search -V -c test_gnunet_fs_ns_data.conf gplad') - search.expect (re.compile ("gnunet-download gnunet://fs/sks/.*/myroot\r")) - search.expect (re.compile (" *description: Free Software Licenses\r")) - search.kill (signal.SIGTERM) - search.expect (pexpect.EOF) + s = pexpect () + s.spawn (None, [search, '-V', '-t', '1000', '-N', '1', '-c', 'test_gnunet_fs_ns_data.conf', 'gplad'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + s.expect ("stdout", re.compile (r'#0:\r?\n')) + s.expect ("stdout", re.compile (r'gnunet-download gnunet://fs/sks/.*/myroot\r?\n')) + s.expect ("stdout", re.compile (r'\s*description: Free Software Licenses\r?\n')) - pseu = pexpect.spawn ('gnunet-pseudonym -c test_gnunet_fs_ns_data.conf') - pseu.expect (re.compile ("Free Software Licenses.*:\r")) - pseu.expect (pexpect.EOF) + pseu = pexpect () + pseu.spawn (None, [pseudonym, '-c', 'test_gnunet_fs_ns_data.conf'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + pseu.expect ("stdout", re.compile (r'Free Software Licenses.*:\r?\n')) finally: - os.system ('gnunet-arm -c test_gnunet_fs_ns_data.conf -eq') - os.system ('rm -rf /tmp/gnunet-test-fs-py-ns/') + arm = subprocess.Popen ([gnunetarm, '-eq', '-c', 'test_gnunet_fs_ns_data.conf']) + arm.communicate () + if os.name == "nt": + shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"), True) + else: + shutil.rmtree ("/tmp/gnunet-test-fs-py-ns", True) diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in index d66b8b994..aac10f2de 100755 --- a/src/fs/test_gnunet_fs_psd.py.in +++ b/src/fs/test_gnunet_fs_psd.py.in @@ -18,31 +18,62 @@ # Boston, MA 02111-1307, USA. # # Testcase for file-sharing command-line tools (publish, search, download) -import pexpect +import sys import os -import signal +import subprocess import re +import shutil + +srcdir = "../.." +gnunet_pyexpect_dir = os.path.join (srcdir, "contrib", "gnunet_pyexpect") +if gnunet_pyexpect_dir not in sys.path: + sys.path.append (gnunet_pyexpect_dir) + +from gnunet_pyexpect import pexpect + +if os.name == 'posix': + download = 'gnunet-download' + gnunetarm = 'gnunet-arm' + publish = 'gnunet-publish' + unindex = 'gnunet-unindex' + search = 'gnunet-search' +elif os.name == 'nt': + download = 'gnunet-download.exe' + gnunetarm = 'gnunet-arm.exe' + publish = 'gnunet-publish.exe' + unindex = 'gnunet-unindex.exe' + search = 'gnunet-search.exe' + +if os.name == "nt": + shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-psd"), True) +else: + shutil.rmtree ("/tmp/gnunet-test-fs-py-psd", True) + +arm = subprocess.Popen ([gnunetarm, '-sq', '-c', 'test_gnunet_fs_psd_data.conf']) +arm.communicate () -os.system ('rm -rf /tmp/gnunet-test-fs-py-psd/') -os.system ('gnunet-arm -sq -c test_gnunet_fs_psd_data.conf') -try: # first, basic publish-search-download run - pub = pexpect.spawn ('gnunet-publish -n -c test_gnunet_fs_psd_data.conf -m "description:The GNU Public License" -k gpl ../../COPYING') - pub.expect ('Publishing `../../COPYING\' done.\r') - pub.expect ("URI is `gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147'.\r") - pub.expect (pexpect.EOF) - - search = pexpect.spawn ('gnunet-search -V -c test_gnunet_fs_psd_data.conf gpl') - search.expect ("gnunet-download -o \"COPYING\" gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147\r") - search.expect (re.compile (" *description: The GNU Public License\r")); - search.kill (signal.SIGTERM) - search.expect (pexpect.EOF) +try: + pub = pexpect () + pub.spawn (None, [publish, '-c', 'test_gnunet_fs_psd_data.conf', '-n', '-m', "description:The GNU Public License", '-k', 'gpl', '../../COPYING'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + pub.expect ("stdout", re.compile (r"Publishing `\.\./\.\./COPYING' done\.\r?\n")) + pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O\.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG\.35147'\.\r?\n")) + + s = pexpect () + s.spawn (None, [search, '-V', '-t', '1000', '-N', '1', '-c', 'test_gnunet_fs_psd_data.conf', 'gpl'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + s.expect ("stdout", re.compile (r'#0:\r?\n')) + s.expect ("stdout", re.compile (r'gnunet-download -o "COPYING" gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O\.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG\.35147\r?\n')) + s.expect ("stdout", re.compile (r"\s*description: The GNU Public License\r?\n")) - down = pexpect.spawn ('gnunet-download -c test_gnunet_fs_psd_data.conf -o \"COPYING\" gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147') - down.expect (re.compile ("Downloading `COPYING\' done \(.*\).\r")); - down.expect (pexpect.EOF); - os.system ('rm COPYING'); + down = pexpect () + down.spawn (None, [download, '-c', 'test_gnunet_fs_psd_data.conf', '-o', 'COPYING', 'gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + down.expect ("stdout", re.compile (r"Downloading `COPYING' done (.*).\r?\n")) + os.remove ("COPYING") finally: - os.system ('gnunet-arm -c test_gnunet_fs_psd_data.conf -eq') - os.system ('rm -rf /tmp/gnunet-test-fs-py-psd/') + arm = subprocess.Popen ([gnunetarm, '-eq', '-c', 'test_gnunet_fs_psd_data.conf']) + arm.communicate () + if os.name == "nt": + shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-psd"), True) + else: + shutil.rmtree ("/tmp/gnunet-test-fs-py-psd", True) diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in index 3c990b35b..5b1b7f0e6 100755 --- a/src/fs/test_gnunet_fs_rec.py.in +++ b/src/fs/test_gnunet_fs_rec.py.in @@ -18,36 +18,75 @@ # Boston, MA 02111-1307, USA. # # Testcase for file-sharing command-line tools (recursive publishing & download) -import pexpect +import sys import os -import signal +import subprocess import re +import shutil -os.system ('rm -rf /tmp/gnunet-test-fs-py-rec/') -os.system ('gnunet-arm -sq -c test_gnunet_fs_rec_data.conf') +srcdir = "../.." +gnunet_pyexpect_dir = os.path.join (srcdir, "contrib", "gnunet_pyexpect") +if gnunet_pyexpect_dir not in sys.path: + sys.path.append (gnunet_pyexpect_dir) + +from gnunet_pyexpect import pexpect + +if os.name == 'posix': + download = 'gnunet-download' + gnunetarm = 'gnunet-arm' + publish = 'gnunet-publish' + unindex = 'gnunet-unindex' + search = 'gnunet-search' + directory = 'gnunet-directory' +elif os.name == 'nt': + download = 'gnunet-download.exe' + gnunetarm = 'gnunet-arm.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) +else: + shutil.rmtree ("/tmp/gnunet-test-fs-py-rec", True) + +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') +# first, basic publish-search-download run try: - pub = pexpect.spawn ('gnunet-publish -c test_gnunet_fs_rec_data.conf -d -k testdir dir/') - pub.expect ('Publishing `dir/\' done.\r') - pub.expect ("URI is `gnunet://fs/chk/M2I80IUI2DM4L6G93KL15AHAO7MIMS5JKP1L3LQFVN50CT7AKRQDSF594BC9TD97JJIT3COF6B5O524CMIOG9EJO8UK1560M54JRI70.GBRE5M4QJ7NA0QIN88FMSC78NNOQMVT5DH8FP37OIR5SGGHFEB9ESDNBRKT9PFE9N2GOI81UN8GGBR6KH9GRTV1T04JFSJURF2U0VE8.20182'.") - pub.expect (pexpect.EOF) - - down = pexpect.spawn ('gnunet-download -c test_gnunet_fs_rec_data.conf -R -o rdir.gnd gnunet://fs/chk/M2I80IUI2DM4L6G93KL15AHAO7MIMS5JKP1L3LQFVN50CT7AKRQDSF594BC9TD97JJIT3COF6B5O524CMIOG9EJO8UK1560M54JRI70.GBRE5M4QJ7NA0QIN88FMSC78NNOQMVT5DH8FP37OIR5SGGHFEB9ESDNBRKT9PFE9N2GOI81UN8GGBR6KH9GRTV1T04JFSJURF2U0VE8.20182') - down.expect (re.compile ("Downloading `rdir.gnd\' done \(.*\).\r")); - down.expect (pexpect.EOF); - - dir = pexpect.spawn ('gnunet-directory -c test_gnunet_fs_rec_data.conf rdir/a.gnd') - dir.expect (re.compile ("Directory `a/' meta data:")); - dir.expect (re.compile ("Directory `a/' contents:")); - dir.expect (re.compile ("COPYING (.*)")); - dir.expect (re.compile ("INSTALL (.*)")); - dir.expect (pexpect.EOF) - - os.system ('rm -r rdir/b.gnd rdir/a.gnd') - if (0 != os.system ("diff -r dir rdir")): + 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")) + + 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.expect ("stdout", re.compile (r"Downloading `rdir.gnd' done (.*).\r?\n")) + + d = pexpect () + d.spawn (None, [directory, '-c', 'test_gnunet_fs_rec_data.conf', 'rdir/a.gnd'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + d.expect ("stdout", re.compile (r"Directory `a/' meta data:\r?\n")) + d.expect ("stdout", re.compile (r"Directory `a/' contents:\r?\n")) + d.expect ("stdout", re.compile (r"COPYING (.*)\r?\n")) + d.expect ("stdout", re.compile (r"INSTALL (.*)\r?\n")) + + 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") + finally: - os.system ('gnunet-arm -c test_gnunet_fs_rec_data.conf -eq') - os.system ('rm -r dir rdir rdir.gnd') - os.system ('rm -rf /tmp/gnunet-test-fs-py-rec/') + arm = subprocess.Popen ([gnunetarm, '-eq', '-c', 'test_gnunet_fs_rec_data.conf']) + arm.communicate () + if os.name == "nt": + shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-rec"), True) + else: + shutil.rmtree ("/tmp/gnunet-test-fs-py-rec", True) + shutil.rmtree ("dir", True) + shutil.rmtree ("rdir", True) + shutil.rmtree ("rdir.gnd", True)