[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r28476 - gnunet/src/fs
From: |
gnunet |
Subject: |
[GNUnet-SVN] r28476 - gnunet/src/fs |
Date: |
Thu, 8 Aug 2013 17:39:03 +0200 |
Author: grothoff
Date: 2013-08-08 17:39:03 +0200 (Thu, 08 Aug 2013)
New Revision: 28476
Modified:
gnunet/src/fs/test_fs_defaults.conf
gnunet/src/fs/test_gnunet_fs_ns.py.in
Log:
-update testcase
Modified: gnunet/src/fs/test_fs_defaults.conf
===================================================================
--- gnunet/src/fs/test_fs_defaults.conf 2013-08-08 15:34:23 UTC (rev 28475)
+++ gnunet/src/fs/test_fs_defaults.conf 2013-08-08 15:39:03 UTC (rev 28476)
@@ -1,9 +1,6 @@
[PATHS]
SERVICEHOME = /tmp/gnunet-test-fs-lib/
-[gnunetd]
-HOSTKEY = $SERVICEHOME/.hostkey
-
[resolver]
PORT = 4364
HOSTNAME = localhost
@@ -62,9 +59,6 @@
[testing]
WEAKRANDOM = YES
-[testing_old]
-HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat
-
[dhtcache]
QUOTA=65536
DATABASE=heap
Modified: gnunet/src/fs/test_gnunet_fs_ns.py.in
===================================================================
--- gnunet/src/fs/test_gnunet_fs_ns.py.in 2013-08-08 15:34:23 UTC (rev
28475)
+++ gnunet/src/fs/test_gnunet_fs_ns.py.in 2013-08-08 15:39:03 UTC (rev
28476)
@@ -37,12 +37,14 @@
publish = 'gnunet-publish'
unindex = 'gnunet-unindex'
search = 'gnunet-search'
+ identity = 'gnunet-identity'
elif os.name == 'nt':
pseudonym = 'gnunet-pseudonym.exe'
gnunetarm = 'gnunet-arm.exe'
publish = 'gnunet-publish.exe'
unindex = 'gnunet-unindex.exe'
search = 'gnunet-search.exe'
+ identity = 'gnunet-identity.exe'
if os.name == "nt":
shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"),
True)
@@ -54,13 +56,9 @@
try:
pseu = pexpect ()
- pseu.spawn (None, [pseudonym, '-c', 'test_gnunet_fs_ns_data.conf', '-C',
'licenses', '-k', 'gplad', '-m', 'description:Free Software Licenses', '-R',
'myroot'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
- pseu.spawn (None, [pseudonym, '-c', 'test_gnunet_fs_ns_data.conf', '-o'],
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
- pseu.expect ("stdout", re.compile (r"licenses (.*)\r?\n"))
+ pseu.spawn (None, [identity, '-c', 'test_gnunet_fs_ns_data.conf', '-C',
'licenses'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+ pseu.spawn (None, [pseudonym, '-c', 'test_gnunet_fs_ns_data.conf', '-A',
'licenses', '-k', 'gplad', '-m', 'description:Free Software Licenses', '-R',
'myroot'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
- pub = pexpect ()
- pub.spawn (None, [publish, '-c', 'test_gnunet_fs_ns_data.conf', '-k',
'licenses', '-P', 'licenses', '-u',
'gnunet://fs/chk/PC0M19QMQC0BPSHR6BGA228PP6INER1D610MGEMOMEM87222FN8HVUO7PQGO0O9HD2GVLHF2N5IDHEQUNK6LKE428FPO96SKQEA486O.PG7K85JGQ6N599MD5HEP3CHEVFPKQD9JB6NPSLVA3T1SKDS66CFI499VS6MGQ88B0QUAVT1282TCRD4GGFVUKDLGI8F0SPIANA3J2LG.35147',
'-t', 'gpl', '-N', 'gpl3'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-
s = pexpect ()
s.spawn (None, [search, '-V', '-t', '1000', '-N', '1', '-c',
'test_gnunet_fs_ns_data.conf', 'gplad'], stdout=subprocess.PIPE,
stderr=subprocess.STDOUT)
s.expect ("stdout", re.compile (r'#0:\r?\n'))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r28476 - gnunet/src/fs,
gnunet <=