making py-tests work with amatus changes in fs

[oweals/gnunet.git] / src / fs / test_gnunet_fs_ns.py

diff --git a/src/fs/test_gnunet_fs_ns.py b/src/fs/test_gnunet_fs_ns.py
index a9b0b18bd6ce06f177bfcb3b8c7e1b3a75009e99..616b52a29156b100272124134732412e679c4808 100755 (executable)
--- a/src/fs/test_gnunet_fs_ns.py
+++ b/src/fs/test_gnunet_fs_ns.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python 
 #    This file is part of GNUnet.
 #    (C) 2010 Christian Grothoff (and other contributing authors)
 #
@@ -23,27 +23,28 @@ import os
 import signal
 import re
 
-os.system ('rm -rf /tmp/gnunet-test-fs-py/')
-os.system ('gnunet-arm -sq -c test_gnunet_fs_data.conf')
+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_data.conf -C licenses -k gplad -m "description:Free Software Licenses" -r myroot')
+  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_data.conf -o')
+  pseu = pexpect.spawn ('gnunet-pseudonym -c test_gnunet_fs_ns_data.conf -o')
   pseu.expect (re.compile("licenses \(.*\)\r"))
   pseu.expect (pexpect.EOF)
 
-  pub = pexpect.spawn ('gnunet-publish -c test_gnunet_fs_data.conf -k licenses -P licenses -u gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147 -t gpl -N gpl3')
+  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)
 
-  search = pexpect.spawn ('gnunet-search -V -c test_gnunet_fs_data.conf gplad')
+  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)
 
-  pseu = pexpect.spawn ('gnunet-pseudonym -c test_gnunet_fs_data.conf')
+  pseu = pexpect.spawn ('gnunet-pseudonym -c test_gnunet_fs_ns_data.conf')
   pseu.expect (re.compile ("Free Software Licenses.*:\r"))
   pseu.expect (pexpect.EOF)
 
 finally:
-  os.system ('gnunet-arm -c test_gnunet_fs_data.conf -eq')
+  os.system ('gnunet-arm -c test_gnunet_fs_ns_data.conf -eq')
+  os.system ('rm -rf /tmp/gnunet-test-fs-py-ns/')