diff options
author | Christian Grothoff <christian@grothoff.org> | 2012-01-22 07:19:38 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2012-01-22 07:19:38 +0000 |
commit | 41b705f79807d8938c20fe67490c7e63c5f16165 (patch) | |
tree | f11f29a2b0778b298bedde252fd7a918da7a5b2e /src/fs/test_gnunet_fs_rec.py.in | |
parent | ea907a5c767e7e884adf605cea358bb45246d6c3 (diff) | |
download | gnunet-41b705f79807d8938c20fe67490c7e63c5f16165.tar.gz gnunet-41b705f79807d8938c20fe67490c7e63c5f16165.zip |
-LRN: Adapt-fs-tests-to-new-gnunet-publish-verbosity
Diffstat (limited to 'src/fs/test_gnunet_fs_rec.py.in')
-rwxr-xr-x | src/fs/test_gnunet_fs_rec.py.in | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in index 0418e0ce9..707a17612 100755 --- a/src/fs/test_gnunet_fs_rec.py.in +++ b/src/fs/test_gnunet_fs_rec.py.in | |||
@@ -60,8 +60,29 @@ os.system ('tar xfz test_gnunet_fs_rec_data.tgz') | |||
60 | try: | 60 | try: |
61 | pub = pexpect () | 61 | pub = pexpect () |
62 | pub.spawn (None, [publish, '-c', 'test_gnunet_fs_rec_data.conf', '-d', '-k', 'testdir', 'dir/'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) | 62 | pub.spawn (None, [publish, '-c', 'test_gnunet_fs_rec_data.conf', '-d', '-k', 'testdir', 'dir/'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT) |
63 | pub.expect ("stdout", re.compile (r"Publishing `dir/' done\.\r?\n")) | 63 | pub.expect ("stdout", re.compile (r"Scanning directory `.+[\\/]dir[\\/]'\.\r?\n")) |
64 | pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/M2I80IUI2DM4L6G93KL15AHAO7MIMS5JKP1L3LQFVN50CT7AKRQDSF594BC9TD97JJIT3COF6B5O524CMIOG9EJO8UK1560M54JRI70\.GBRE5M4QJ7NA0QIN88FMSC78NNOQMVT5DH8FP37OIR5SGGHFEB9ESDNBRKT9PFE9N2GOI81UN8GGBR6KH9GRTV1T04JFSJURF2U0VE8\.20182'\.\r?\n")) | 64 | # Directory listing order is undefined, so only one thing is certain - that we start with `dir/' |
65 | pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n")) | ||
66 | pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n")) | ||
67 | pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n")) | ||
68 | pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n")) | ||
69 | pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n")) | ||
70 | pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n")) | ||
71 | # Same goes for publishing order - the last one is the toplevel directory | ||
72 | pub.expect ("stdout", re.compile (r"Publishing `.+' done\.\r?\n")) | ||
73 | pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n")) | ||
74 | pub.expect ("stdout", re.compile (r"Publishing `.+[\\/]dir[\\/]a[\\/]INSTALL' done\.\r?\n")) | ||
75 | pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n")) | ||
76 | pub.expect ("stdout", re.compile (r"Publishing `.+[\\/]dir[\\/]a' done\.\r?\n")) | ||
77 | pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n")) | ||
78 | pub.expect ("stdout", re.compile (r"Publishing `.+[\\/]dir[\\/]b[\\/]NEWS' done\.\r?\n")) | ||
79 | pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n")) | ||
80 | pub.expect ("stdout", re.compile (r"Publishing `.+[\\/]dir[\\/]b' done\.\r?\n")) | ||
81 | pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n")) | ||
82 | pub.expect ("stdout", re.compile (r"Publishing `.+[\\/]dir[\\/]NEWS' done\.\r?\n")) | ||
83 | pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n")) | ||
84 | pub.expect ("stdout", re.compile (r"Publishing `.+[\\/]dir[\\/]' done\.\r?\n")) | ||
85 | pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/EA6RCK9L9KEH6N9P7BI127R1A0L8C9KEQQF7UUJMS9CIDM0I2ETQ3N9H6T47JTH58I97MIPOQDNGE25Q9BJ78MLBCEDVP6QVMQ7K0U8\.8CB2RLQUS4RQTU65BQK0A8HU2DS4AJLDE1F3HP0EG1LEQ9DEPIIQA4CD2I9A9UL02INBFSG9RA9JRLPIPF2RI8O3PBSB520HAB6OAO8\.20324'\.\r?\n")) | ||
65 | 86 | ||
66 | down = pexpect () | 87 | down = pexpect () |
67 | 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) | 88 | 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) |