more flakes.

Signed-off-by: Nils Gillmann <ng0@n0.is>

3 files changed, 99 insertions, 97 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
 import shutil
 
 srcdir = "../.."
-gnunet_pyexpect_dir = os.path.join (srcdir, "contrib/scripts")
+gnunet_pyexpect_dir = os.path.join(srcdir, "contrib/scripts")
 if gnunet_pyexpect_dir not in sys.path:
-  sys.path.append (gnunet_pyexpect_dir)
+    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'
+    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'
+    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)
+    shutil.rmtree(os.path.join(os.getenv("TEMP"), "gnunet-test-fs-py-idx"), True)
 else:
-  shutil.rmtree ("/tmp/gnunet-test-fs-py-idx", True)
+    shutil.rmtree("/tmp/gnunet-test-fs-py-idx", True)
 
-arm = subprocess.Popen ([gnunetarm, '-sq', '-c', 'test_gnunet_fs_idx_data.conf'])
-arm.communicate ()
+arm = subprocess.Popen([gnunetarm, '-sq', '-c', 'test_gnunet_fs_idx_data.conf'])
+arm.communicate()
 
 try:
-  pub = pexpect ()
+    pub = pexpect()
 
-  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)
-  pub.expect ("stdout", re.compile (r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n"))
+    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)
+    pub.expect("stdout", re.compile(r"URI is `gnunet://fs/chk/2ZMHKPV74CB6GB1GFKQRR95BXJQA2SER25FN48GAW7WSBPA0GDEM5Y74V1ZJHM0NA6919TVW376BHTFDRE3RYS0KRY92M1QJVKPHFCR\.49BT3V5C10KA1695JF71FCT8ZZG4JMJSH04BD9CT22R6KEM915A7CEST17RD0QYTHXV5M4HHEGJMEZSFRDB7JAYC0EMJAN2V781E9DG\.17822'\.\r?\n"))
 
-  down = pexpect ()
-  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)
-  down.expect ("stdout", re.compile (r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n"))
-  os.remove ("test_gnunet_fs_rec_data.tar.gz")
+    down = pexpect()
+    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)
+    down.expect("stdout", re.compile(r"Downloading `test_gnunet_fs_rec_data.tar.gz' done (.*).\r?\n"))
+    os.remove("test_gnunet_fs_rec_data.tar.gz")
 
-  un = pexpect ()
-  un.spawn (None, [unindex, '-c', 'test_gnunet_fs_idx_data.conf', 'test_gnunet_fs_rec_data.tgz'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-  un.expect ("stdout", re.compile (r'Unindexing done\.\r?\n'))
+    un = pexpect()
+    un.spawn(None, [unindex, '-c', 'test_gnunet_fs_idx_data.conf', 'test_gnunet_fs_rec_data.tgz'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    un.expect("stdout", re.compile(r'Unindexing done\.\r?\n'))
 
 finally:
-  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)
+    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_psd.py.in b/src/fs/test_gnunet_fs_psd.py.in
index b27a24c84..4b27b4532 100755
--- a/src/fs/test_gnunet_fs_psd.py.in
+++ b/src/fs/test_gnunet_fs_psd.py.in
@@ -36,7 +36,7 @@ reload(sys)
 sys.setdefaultencoding('utf8')
 
 srcdir = "../.."
-gnunet_pyexpect_dir = os.path.join (srcdir, "contrib/scripts")
+gnunet_pyexpect_dir = os.path.join(srcdir, "contrib/scripts")
 if gnunet_pyexpect_dir not in sys.path:
     sys.path.append(gnunet_pyexpect_dir)
 
diff --git a/src/fs/test_gnunet_fs_rec.py.in b/src/fs/test_gnunet_fs_rec.py.in
index e20a9ff78..aa9b7b461 100755
--- a/src/fs/test_gnunet_fs_rec.py.in
+++ b/src/fs/test_gnunet_fs_rec.py.in
@@ -27,88 +27,90 @@ import tarfile
 import filecmp
 
 srcdir = "../.."
-gnunet_pyexpect_dir = os.path.join (srcdir, "contrib/scripts")
+gnunet_pyexpect_dir = os.path.join(srcdir, "contrib/scripts")
 if gnunet_pyexpect_dir not in sys.path:
-  sys.path.append (gnunet_pyexpect_dir)
+    sys.path.append(gnunet_pyexpect_dir)
 
 from gnunet_pyexpect import pexpect
 from pydiffer import dcdiff
 
 if os.name == 'posix':
-  download = './gnunet-download'
-  gnunetarm = 'gnunet-arm'
-  publish = './gnunet-publish'
-  unindex = './gnunet-unindex'
-  search = './gnunet-search'
-  directory = './gnunet-directory'
+    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'
+    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)
+    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("/tmp/gnunet-test-fs-py-rec", True)
 
-arm = subprocess.Popen ([gnunetarm, '-sq', '-c', 'test_gnunet_fs_rec_data.conf'])
-arm.communicate ()
+arm = subprocess.Popen([gnunetarm, '-sq', '-c', 'test_gnunet_fs_rec_data.conf'])
+arm.communicate()
 
-# pray that `tar' is in PATH
-tar = tarfile.open ('test_gnunet_fs_rec_data.tgz')
-tar.extractall ()
+# pray that `tar' is in PATH.
+# FIXME: Actually we should check for that and output
+#        a message if it isn't found.
+tar = tarfile.open('test_gnunet_fs_rec_data.tgz')
+tar.extractall()
 # first, basic publish-search-download run
 try:
-  pub = pexpect ()
-  pub.spawn (None, [publish, '-c', 'test_gnunet_fs_rec_data.conf', '-d', '-k', 'testdir', 'dir/'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-  # Can't say much for publishing, except that 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 `.+' 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 `.+' 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 `.+' 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 `.+' 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 `.+' 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"))
-  m = pub.expect ("stdout", re.compile (r".+\r?\n"))
-  if not m:
-    sys.exit (3)
-  output = m.string
-  url = output[output.find ("`")+1:output.find("'")]
+    pub = pexpect()
+    pub.spawn(None, [publish, '-c', 'test_gnunet_fs_rec_data.conf', '-d', '-k', 'testdir', 'dir/'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    # Can't say much for publishing, except that 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 `.+' 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 `.+' 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 `.+' 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 `.+' 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 `.+' 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"))
+    m = pub.expect("stdout", re.compile(r".+\r?\n"))
+    if not m:
+        sys.exit(3)
+    output = m.string
+    url = output[output.find("`")+1:output.find("'")]
 
-  down = pexpect ()
-  down.spawn (None, [download, '-c', 'test_gnunet_fs_rec_data.conf', '-R', '-o', 'rdir.gnd', url], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-  down.expect ("stdout", re.compile (r"Downloading `rdir.gnd' done (.*).\r?\n"))
+    down = pexpect()
+    down.spawn(None, [download, '-c', 'test_gnunet_fs_rec_data.conf', '-R', '-o', 'rdir.gnd', url], 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"))
+    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")
+    diff = dcdiff('dir', 'rdir')
+    if len(diff) != 0:
+        raise Exception("Unexpected difference between source directory and downloaded result:\n{}".format(diff))
 
-  os.remove ("rdir/b.gnd")
-  os.remove ("rdir/a.gnd")
-  diff = dcdiff ('dir', 'rdir')
-  if len (diff) != 0:
-    raise Exception ("Unexpected difference between source directory and downloaded result:\n{}".format (diff))
-  
 
 finally:
-  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)
+    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)