run py script with config

diff --git a/src/fs/test_gnunet_fs.py b/src/fs/test_gnunet_fs.py
index b1b2e31c6ea8c73a2824661c6e151de22e452b75..1d55b32ceebcedbc08db66dba86177efbebc9201 100755 (executable)
--- a/src/fs/test_gnunet_fs.py
+++ b/src/fs/test_gnunet_fs.py
@@ -30,38 +30,38 @@ import os
 import signal
 import re
 
-os.system ('gnunet-arm -s')
+os.system ('gnunet-arm -sq -c test_gnunet_fs_data.conf')
 try:
 # first, basic publish-search-download run
-  pub = pexpect.spawn ('gnunet-publish -k gpl ../../COPYING')
+  pub = pexpect.spawn ('gnunet-publish -c test_gnunet_fs_data.conf -k gpl ../../COPYING')
   pub.expect ('Publishing `../../COPYING\' done.\r')
   pub.expect ("URI is `gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147'.\r")
   pub.expect (pexpect.EOF)
 
-  search = pexpect.spawn ('gnunet-search gpl')
+  search = pexpect.spawn ('gnunet-search -c test_gnunet_fs_data.conf gpl')
   search.expect ("gnunet-download -o \"COPYING\" gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147\r")
   search.kill (signal.SIGTERM)
   search.expect (pexpect.EOF)
 # FIXME: check for meta-data (also need to add meta data in publish call!)
   
-  down = pexpect.spawn ('gnunet-download -o \"COPYING\" gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147')
+  down = pexpect.spawn ('gnunet-download -c test_gnunet_fs_data.conf -o \"COPYING\" gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147')
   down.expect (re.compile ("Downloading `COPYING\' done \(.*\).\r"));
   down.expect (pexpect.EOF);
   os.system ('rm COPYING');
 
 # second, same with namespace creation  
-  pseu = pexpect.spawn ('gnunet-pseudonym -C licenses -k gpl -k test -m "description:Free Software Licenses"')
+  pseu = pexpect.spawn ('gnunet-pseudonym -c test_gnunet_fs_data.conf -C licenses -k gpl -k test -m "description:Free Software Licenses"')
   pseu.expect (pexpect.EOF)
-  pseu = pexpect.spawn ('gnunet-pseudonym -o')
+  pseu = pexpect.spawn ('gnunet-pseudonym -c test_gnunet_fs_data.conf -o')
   pseu.expect (re.compile("licenses \(.*\)\r"))
   pseu.expect (pexpect.EOF)
 
-  pub = pexpect.spawn ('gnunet-publish -k licenses -P licenses -u gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147 -t gpl -N gpl3')
+  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.expect (pexpect.EOF)
 
-#  search = pexpect.spawn ('gnunet-search licenses')
+#  search = pexpect.spawn ('gnunet-search -c test_gnunet_fs_data.conf licenses')
 # FIXME: check that namespace was found (code currently does not work for NBLOCKS!)
 # FIXME: check for meta-data! (use gnunet-pseudonym to display?)
 
 finally:
-  os.system ('gnunet-arm -e')
+  os.system ('gnunet-arm -c test_gnunet_fs_data.conf -eq')

diff --git a/src/fs/test_gnunet_fs_data.conf b/src/fs/test_gnunet_fs_data.conf
new file mode 100644 (file)
index 0000000..45cb9ae
--- /dev/null
+++ b/src/fs/test_gnunet_fs_data.conf
@@ -0,0 +1,44 @@
+[PATHS]
+SERVICEHOME = /tmp/gnunet-test-fs-py/
+DEFAULTCONFIG = test_gnunet_fs_data.conf
+
+[gnunetd]
+HOSTKEY = $SERVICEHOME/.hostkey
+
+[resolver]
+PORT = 44464
+HOSTNAME = localhost
+
+[transport]
+PORT = 44465
+PLUGINS = 
+
+[arm]
+PORT = 44466
+HOSTNAME = localhost
+DEFAULTSERVICES = resolver datastore transport core statistics fs
+
+[datastore]
+# DEBUG = YES
+
+[statistics]
+PORT = 44467
+HOSTNAME = localhost
+
+[peerinfo]
+PORT = 44469
+HOSTNAME = localhost
+
+[core]
+PORT = 44470
+HOSTNAME = localhost
+
+[fs]
+PORT = 44471
+HOSTNAME = localhost
+#DEBUG = YES
+#PREFIX = valgrind --tool=memcheck --leak-check=yes
+#BINARY = /home/grothoff/bin/gnunet-service-fs
+
+[testing]
+WEAKRANDOM = YES