3 files changed, 29 insertions, 4 deletions

diff --git a/src/fs/test_gnunet_fs_idx.py.in b/src/fs/test_gnunet_fs_idx.py.in
index fff0e10b7..3b05516c6 100755
--- a/src/fs/test_gnunet_fs_idx.py.in
+++ b/src/fs/test_gnunet_fs_idx.py.in
@@ -53,7 +53,9 @@ arm.communicate ()
 try:
   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"Scanning file `.+[\\/]\.\.[\\/]\.\.[\\/]COPYING'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Scanner has finished\.\r?\n"))
+  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 ()
diff --git a/src/fs/test_gnunet_fs_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
index 94c62f758..0ac4d6c67 100755
--- a/src/fs/test_gnunet_fs_psd.py.in
+++ b/src/fs/test_gnunet_fs_psd.py.in
@@ -56,7 +56,9 @@ arm.communicate ()
 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"Scanning file `.+[\\/]..[\\/]..[\\/]COPYING'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Scanner has finished.\r?\n"))
+  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 ()
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')
 try:
   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"))
+  pub.expect ("stdout", re.compile (r"Scanning directory `.+[\\/]dir[\\/]'\.\r?\n"))
+  # Directory listing order is undefined, so only one thing is certain - that we start with `dir/'
+  pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Scanning .+\.\r?\n"))
+  # Same goes for publishing order - the last one is the toplevel directory
+  pub.expect ("stdout", re.compile (r"Publishing `.+' done\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Publishing `.+[\\/]dir[\\/]a[\\/]INSTALL' done\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Publishing `.+[\\/]dir[\\/]a' done\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Publishing `.+[\\/]dir[\\/]b[\\/]NEWS' done\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Publishing `.+[\\/]dir[\\/]b' done\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Publishing `.+[\\/]dir[\\/]NEWS' done\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/[A-Z0-9]{103}\.[A-Z0-9]{103}\.\d+'\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"Publishing `.+[\\/]dir[\\/]' done\.\r?\n"))
+  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/EA6RCK9L9KEH6N9P7BI127R1A0L8C9KEQQF7UUJMS9CIDM0I2ETQ3N9H6T47JTH58I97MIPOQDNGE25Q9BJ78MLBCEDVP6QVMQ7K0U8\.8CB2RLQUS4RQTU65BQK0A8HU2DS4AJLDE1F3HP0EG1LEQ9DEPIIQA4CD2I9A9UL02INBFSG9RA9JRLPIPF2RI8O3PBSB520HAB6OAO8\.20324'\.\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)