diff options
author | Nils Gillmann <ng0@n0.is> | 2018-05-23 17:31:01 +0000 |
---|---|---|
committer | Nils Gillmann <ng0@n0.is> | 2018-05-23 17:31:01 +0000 |
commit | 454935bd76a9106ad6eda4d5c3d0861d6e559777 (patch) | |
tree | 90d716dc77ba50292cd509e1331c4fc68296f008 /src/fs/test_gnunet_fs_idx.py.in | |
parent | 4d34c5de8369158f903f2b709e7999cd7b9340c2 (diff) | |
download | gnunet-454935bd76a9106ad6eda4d5c3d0861d6e559777.tar.gz gnunet-454935bd76a9106ad6eda4d5c3d0861d6e559777.zip |
more flakes.
Signed-off-by: Nils Gillmann <ng0@n0.is>
Diffstat (limited to 'src/fs/test_gnunet_fs_idx.py.in')
-rwxr-xr-x | src/fs/test_gnunet_fs_idx.py.in | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in index 30592c2e4..a669998fb 100755 --- a/src/fs/test_gnunet_fs_idx.py.in +++ b/src/fs/test_gnunet_fs_idx.py.in | |||
@@ -25,50 +25,50 @@ import re | |||
25 | import shutil | 25 | import shutil |
26 | 26 | ||
27 | srcdir = "../.." | 27 | srcdir = "../.." |
28 | gnunet_pyexpect_dir = os.path.join (srcdir, "contrib/scripts") | 28 | gnunet_pyexpect_dir = os.path.join(srcdir, "contrib/scripts") |
29 | if gnunet_pyexpect_dir not in sys.path: | 29 | if gnunet_pyexpect_dir not in sys.path: |
30 | sys.path.append (gnunet_pyexpect_dir) | 30 | sys.path.append(gnunet_pyexpect_dir) |
31 | 31 | ||
32 | from gnunet_pyexpect import pexpect | 32 | from gnunet_pyexpect import pexpect |
33 | 33 | ||
34 | if os.name == 'posix': | 34 | if os.name == 'posix': |
35 | download = './gnunet-download' | 35 | download = './gnunet-download' |
36 | gnunetarm = 'gnunet-arm' | 36 | gnunetarm = 'gnunet-arm' |
37 | publish = './gnunet-publish' | 37 | publish = './gnunet-publish' |
38 | unindex = './gnunet-unindex' | 38 | unindex = './gnunet-unindex' |
39 | elif os.name == 'nt': | 39 | elif os.name == 'nt': |
40 | download = './gnunet-download.exe' | 40 | download = './gnunet-download.exe' |
41 | gnunetarm = 'gnunet-arm.exe' | 41 | gnunetarm = 'gnunet-arm.exe' |
42 | publish = './gnunet-publish.exe' | 42 | publish = './gnunet-publish.exe' |
43 | unindex = './gnunet-unindex.exe' | 43 | unindex = './gnunet-unindex.exe' |
44 | 44 | ||
45 | if os.name == "nt": | 45 | if os.name == "nt": |
46 | shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-idx"), True) | 46 | shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True) |
47 | else: | 47 | else: |
48 | shutil.rmtree ("/tmp/gnunet-test-fs-py-idx", True) | 48 | shutil.rmtree("/tmp/gnunet-test-fs-py-idx", True) |
49 | 49 | ||
50 | arm = subprocess.Popen ([gnunetarm, '-sq', '-c', 'test_gnunet_fs_idx_data.conf']) | 50 | arm = subprocess.Popen([gnunetarm, '-sq', '-c', 'test_gnunet_fs_idx_data.conf']) |
51 | arm.communicate () | 51 | arm.communicate() |
52 | 52 | ||
53 | try: | 53 | try: |
54 | pub = pexpect () | 54 | pub = pexpect() |
55 | 55 | ||
56 | pub.spawn (None, [publish, '-c', 'test_gnunet_fs_idx_data.conf', '-m', "description:Test archive", '-k', 'tst', 'test_gnunet_fs_rec_data.tgz'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) | 56 | pub.spawn(None, [publish, '-c', 'test_gnunet_fs_idx_data.conf', '-m', "description:Test archive", '-k', 'tst', 'test_gnunet_fs_rec_data.tgz'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) |
57 | pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n")) | 57 | pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n")) |
58 | 58 | ||
59 | down = pexpect () | 59 | down = pexpect() |
60 | down.spawn (None, [download, '-c', 'test_gnunet_fs_idx_data.conf', '-o', 'test_gnunet_fs_rec_data.tar.gz', 'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) | 60 | down.spawn(None, [download, '-c', 'test_gnunet_fs_idx_data.conf', '-o', 'test_gnunet_fs_rec_data.tar.gz', 'gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG.17822'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) |
61 | down.expect ("stdout", re.compile (r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n")) | 61 | down.expect("stdout", re.compile(r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n")) |
62 | os.remove ("test_gnunet_fs_rec_data.tar.gz") | 62 | os.remove("test_gnunet_fs_rec_data.tar.gz") |
63 | 63 | ||
64 | un = pexpect () | 64 | un = pexpect() |
65 | un.spawn (None, [unindex, '-c', 'test_gnunet_fs_idx_data.conf', 'test_gnunet_fs_rec_data.tgz'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) | 65 | un.spawn(None, [unindex, '-c', 'test_gnunet_fs_idx_data.conf', 'test_gnunet_fs_rec_data.tgz'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) |
66 | un.expect ("stdout", re.compile (r'Unindexing done\.\r?\n')) | 66 | un.expect("stdout", re.compile(r'Unindexing done\.\r?\n')) |
67 | 67 | ||
68 | finally: | 68 | finally: |
69 | arm = subprocess.Popen ([gnunetarm, '-eq', '-c', 'test_gnunet_fs_idx_data.conf']) | 69 | arm = subprocess.Popen([gnunetarm, '-eq', '-c', 'test_gnunet_fs_idx_data.conf']) |
70 | arm.communicate () | 70 | arm.communicate() |
71 | if os.name == "nt": | 71 | if os.name == "nt": |
72 | shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-idx"), True) | 72 | shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True) |
73 | else: | 73 | else: |
74 | shutil.rmtree ("/tmp/gnunet-test-fs-py-idx", True) | 74 | shutil.rmtree("/tmp/gnunet-test-fs-py-idx", True) |