[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18517 - in gnunet/src/integration-tests: . confs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r18517 - in gnunet/src/integration-tests: . confs |
|
Date: |
Thu, 8 Dec 2011 17:16:24 +0100 |
Author: wachs
Date: 2011-12-08 17:16:24 +0100 (Thu, 08 Dec 2011)
New Revision: 18517
Added:
gnunet/src/integration-tests/confs/
gnunet/src/integration-tests/confs/c_bootstrap_server.conf
gnunet/src/integration-tests/confs/c_nat_client.conf
gnunet/src/integration-tests/confs/c_no_nat_client.conf
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
Modified:
gnunet/src/integration-tests/Makefile.am
gnunet/src/integration-tests/test_integration_clique.py.in
Log:
step by step
Modified: gnunet/src/integration-tests/Makefile.am
===================================================================
--- gnunet/src/integration-tests/Makefile.am 2011-12-08 16:15:03 UTC (rev
18516)
+++ gnunet/src/integration-tests/Makefile.am 2011-12-08 16:16:24 UTC (rev
18517)
@@ -16,7 +16,8 @@
if HAVE_PYTHON_PEXPECT
check_SCRIPTS = \
- test_integration_clique.py
+ test_integration_bootstrap_and_connect.py \
+ test_integration_clique.py
endif
@@ -31,8 +32,13 @@
$(do_subst) < $(srcdir)/test_integration_clique.py.in >
test_integration_clique.py
chmod +x test_integration_clique.py
+test_integration_bootstrap_and_connect.py:
test_integration_bootstrap_and_connect.py.in Makefile
+ $(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in >
test_integration_bootstrap_and_connect.py
+ chmod +x test_integration_bootstrap_and_connect.py
EXTRA_DIST = \
- test_integration_clique.py.in
+ test_integration_bootstrap_and_connect.py.in
+# test_integration_clique.py.in
+
CLEANFILES = $(check_SCRIPTS)
Added: gnunet/src/integration-tests/confs/c_bootstrap_server.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_bootstrap_server.conf
(rev 0)
+++ gnunet/src/integration-tests/confs/c_bootstrap_server.conf 2011-12-08
16:16:24 UTC (rev 18517)
@@ -0,0 +1,344 @@
+[PATHS]
+SERVICEHOME = /tmp/c_bootstrap_server/
+DEFAULTCONFIG = confs/c_bootstrap_server.conf
+
+[gnunetd]
+#HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = hostkeys/0000-hostkey
+
+[resolver]
+AUTOSTART = YES
+PORT = 20017
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-resolver
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-resolver-14
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = NO
+
+[mesh]
+AUTOSTART = YES
+PORT = 20016
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-mesh
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-mesh-13
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[nse]
+AUTOSTART = YES
+PORT = 20015
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-nse
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-nse-12
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+PROOFFILE = $SERVICEHOME/.nse-proof
+HISTOGRAM = $SERVICEHOME/nse-history.log
+WORKDELAY = 5 ms
+INTERVAL = 1 h
+WORKBITS = 26
+
+[topology]
+MINIMUM-FRIENDS = 0
+FRIENDS-ONLY = NO
+AUTOCONNECT = YES
+TARGET-CONNECTION-COUNT = 16
+FRIENDS = $SERVICEHOME/friends
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-topology
+
+[datastore]
+AUTOSTART = YES
+UNIXPATH = /tmp/test-service-datastore-11
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+PORT = 20014
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-datastore
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+QUOTA = 100 MB
+BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
+DATABASE = sqlite
+
+[datastore-sqlite]
+FILENAME = $SERVICEHOME/datastore/sqlite.db
+
+[datastore-postgres]
+CONFIG = connect_timeout=10; dbname=gnunet
+
+[datastore-mysql]
+DATABASE = gnunet
+CONFIG = ~/.my.cnf
+
+[peerinfo]
+AUTOSTART = YES
+PORT = 20013
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-peerinfo
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-peerinfo-10
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
+HOSTS = $SERVICEHOME/data/hosts/
+
+[client]
+HOME = $SERVICEHOME
+
+[TESTING]
+WEAKRANDOM = YES
+CONNECT_TIMEOUT = 30 s
+CONNECT_ATTEMPTS = 3
+MAX_OUTSTANDING_CONNECTIONS = 50
+DELETE_FILES = YES
+
+[ats]
+AUTOSTART = YES
+PORT = 20012
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-ats
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-ats-9
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+WAN_QUOTA_IN = 65536
+WAN_QUOTA_OUT = 65536
+DUMP_MLP = NO
+DUMP_SOLUTION = NO
+DUMP_OVERWRITE = NO
+DUMP_MIN_PEERS = 0
+DUMP_MIN_ADDRS = 0
+ATS_MIN_INTERVAL = 15000
+ATS_EXEC_INTERVAL = 30000
+
+[transport]
+AUTOSTART = YES
+PORT = 20011
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-transport
+NEIGHBOUR_LIMIT = 50
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+PLUGINS = tcp
+UNIXPATH = /tmp/test-service-transport-8
+BLACKLIST_FILE = $SERVICEHOME/blacklist
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[transport-tcp]
+USE_LOCALADDR = YES
+PORT = 20010
+ADVERTISED_PORT = 20010
+MAX_CONNECTIONS = 128
+TIMEOUT = 5 s
+
+[transport-udp]
+USE_LOCALADDR = YES
+PORT = 20009
+BROADCAST = YES
+BROADCAST_INTERVAL = 30000
+MAX_BPS = 1000000
+
+[transport-http]
+PORT = 20008
+MAX_CONNECTIONS = 128
+
+[transport-https]
+PORT = 20007
+CRYPTO_INIT = NORMAL
+KEY_FILE = https.key
+CERT_FILE = https.cert
+MAX_CONNECTIONS = 128
+
+[transport-wlan]
+INTERFACE = mon0
+TESTMODE = 0
+
+[datacache-mysql]
+DATABASE = gnunet
+CONFIG = ~/.my.cnf
+
+[datacache-postgres]
+CONFIG = connect_timeout=10; dbname=gnunet
+
+[template]
+AUTOSTART = NO
+PORT = 20006
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-template
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-template-7
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[fs]
+AUTOSTART = YES
+INDEXDB = $SERVICEHOME/idxinfo.lst
+TRUST = $SERVICEHOME/data/credit/
+IDENTITY_DIR = $SERVICEHOME/identities/
+STATE_DIR = $SERVICEHOME/persistence/
+UPDATE_DIR = $SERVICEHOME/updates/
+PORT = 20005
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-fs
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+DELAY = YES
+CONTENT_CACHING = YES
+CONTENT_PUSHING = YES
+UNIXPATH = /tmp/test-service-fs-6
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
+MAX_PENDING_REQUESTS = 65536
+MIN_MIGRATION_DELAY = 100 ms
+EXPECTED_NEIGHBOUR_COUNT = 128
+
+[vpn]
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-vpn
+IPV6ADDR = 1234::1
+IPV6PREFIX = 32
+IPV4ADDR = 10.11.10.1
+IPV4MASK = 255.255.0.0
+VIRTDNS = 10.11.10.2
+VIRTDNS6 = 1234::17
+IFNAME = vpn-gnunet
+
+[exit]
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-exit
+IPV6ADDR = 1234:1::1
+IPV6PREFIX = 32
+IPV4ADDR = 10.10.1.1
+IPV4MASK = 255.255.0.0
+IFNAME = exit-gnunet
+ENABLE_UDP = NO
+ENABLE_TCP = NO
+
+[dns]
+AUTOSTART = YES
+PORT = 0
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dns
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-dns-5
+PROVIDE_EXIT = NO
+
+[arm]
+PORT = 20004
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-arm
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+DEFAULTSERVICES = topology hostlist
+UNIXPATH = /tmp/test-service-arm-4
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[hostlist]
+HTTPPORT = 8080
+HOME = $SERVICEHOME
+HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-hostlist
+OPTIONS = -p
+#SERVERS = http://v9.gnunet.org:58080/
+HTTP-PROXY =
+
+[core]
+AUTOSTART = YES
+PORT = 20003
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-core
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-core-3
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[nat]
+EXTERNAL_ADDRESS = 127.0.0.1
+INTERNAL_ADDRESS = 127.0.0.1
+BINDTO = 127.0.0.1
+BEHIND_NAT = NO
+PUNCHED_NAT = NO
+ENABLE_UPNP = NO
+USE_LOCALADDR = YES
+USE_HOSTNAME = NO
+ENABLE_ICMP_CLIENT = NO
+ENABLE_ICMP_SERVER = NO
+DISABLEV6 = YES
+RETURN_LOCAL_ADDRESSES = NO
+HOSTNAME_DNS_FREQUENCY = 1200000
+IFC_SCAN_FREQUENCY = 3000000
+DYNDNS_FREQUENCY = 140000
+
+[gnunet-nat-server]
+HOSTNAME = gnunet.org
+PORT = 20002
+
+[statistics]
+AUTOSTART = YES
+PORT = 20001
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-statistics
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-statistics-2
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
+
+[dht]
+AUTOSTART = YES
+PORT = 20000
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dht
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+BUCKET_SIZE = 4
+UNIXPATH = /tmp/test-service-dht-1
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dhtcache]
+DATABASE = sqlite
+QUOTA = 1 MB
+
Added: gnunet/src/integration-tests/confs/c_nat_client.conf
===================================================================
Added: gnunet/src/integration-tests/confs/c_no_nat_client.conf
===================================================================
--- gnunet/src/integration-tests/confs/c_no_nat_client.conf
(rev 0)
+++ gnunet/src/integration-tests/confs/c_no_nat_client.conf 2011-12-08
16:16:24 UTC (rev 18517)
@@ -0,0 +1,344 @@
+[PATHS]
+SERVICEHOME = /tmp/c_no_nat_client/
+DEFAULTCONFIG = confs/c_no_nat_client.conf
+
+[gnunetd]
+#HOSTKEY = $SERVICEHOME/.hostkey
+HOSTKEY = hostkeys/0001-hostkey
+
+[resolver]
+AUTOSTART = YES
+PORT = 20035
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-resolver
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-resolver-28
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = NO
+
+[mesh]
+AUTOSTART = YES
+PORT = 20034
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-mesh
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-mesh-27
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[nse]
+AUTOSTART = YES
+PORT = 20033
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-nse
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-nse-26
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+PROOFFILE = $SERVICEHOME/.nse-proof
+HISTOGRAM = $SERVICEHOME/nse-history.log
+WORKDELAY = 5 ms
+INTERVAL = 1 h
+WORKBITS = 26
+
+[topology]
+MINIMUM-FRIENDS = 0
+FRIENDS-ONLY = NO
+AUTOCONNECT = YES
+TARGET-CONNECTION-COUNT = 16
+FRIENDS = $SERVICEHOME/friends
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-topology
+
+[datastore]
+AUTOSTART = YES
+UNIXPATH = /tmp/test-service-datastore-25
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+PORT = 20032
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-datastore
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+QUOTA = 100 MB
+BLOOMFILTER = $SERVICEHOME/fs/bloomfilter
+DATABASE = sqlite
+
+[datastore-sqlite]
+FILENAME = $SERVICEHOME/datastore/sqlite.db
+
+[datastore-postgres]
+CONFIG = connect_timeout=10; dbname=gnunet
+
+[datastore-mysql]
+DATABASE = gnunet
+CONFIG = ~/.my.cnf
+
+[peerinfo]
+AUTOSTART = YES
+PORT = 20031
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-peerinfo
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-peerinfo-24
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
+HOSTS = $SERVICEHOME/data/hosts/
+
+[client]
+HOME = $SERVICEHOME
+
+[TESTING]
+WEAKRANDOM = NO
+CONNECT_TIMEOUT = 30 s
+CONNECT_ATTEMPTS = 3
+MAX_OUTSTANDING_CONNECTIONS = 50
+DELETE_FILES = YES
+
+[ats]
+AUTOSTART = YES
+PORT = 20030
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-ats
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-ats-23
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+WAN_QUOTA_IN = 65536
+WAN_QUOTA_OUT = 65536
+DUMP_MLP = NO
+DUMP_SOLUTION = NO
+DUMP_OVERWRITE = NO
+DUMP_MIN_PEERS = 0
+DUMP_MIN_ADDRS = 0
+ATS_MIN_INTERVAL = 15000
+ATS_EXEC_INTERVAL = 30000
+
+[transport]
+AUTOSTART = YES
+PORT = 20029
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-transport
+NEIGHBOUR_LIMIT = 50
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+PLUGINS = tcp
+UNIXPATH = /tmp/test-service-transport-22
+BLACKLIST_FILE = $SERVICEHOME/blacklist
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[transport-tcp]
+USE_LOCALADDR = YES
+PORT = 20028
+ADVERTISED_PORT = 20028
+MAX_CONNECTIONS = 128
+TIMEOUT = 5 s
+
+[transport-udp]
+USE_LOCALADDR = YES
+PORT = 20027
+BROADCAST = YES
+BROADCAST_INTERVAL = 30000
+MAX_BPS = 1000000
+
+[transport-http]
+PORT = 20026
+MAX_CONNECTIONS = 128
+
+[transport-https]
+PORT = 20025
+CRYPTO_INIT = NORMAL
+KEY_FILE = https.key
+CERT_FILE = https.cert
+MAX_CONNECTIONS = 128
+
+[transport-wlan]
+INTERFACE = mon0
+TESTMODE = 0
+
+[datacache-mysql]
+DATABASE = gnunet
+CONFIG = ~/.my.cnf
+
+[datacache-postgres]
+CONFIG = connect_timeout=10; dbname=gnunet
+
+[template]
+AUTOSTART = NO
+PORT = 20024
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-template
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-template-21
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[fs]
+AUTOSTART = YES
+INDEXDB = $SERVICEHOME/idxinfo.lst
+TRUST = $SERVICEHOME/data/credit/
+IDENTITY_DIR = $SERVICEHOME/identities/
+STATE_DIR = $SERVICEHOME/persistence/
+UPDATE_DIR = $SERVICEHOME/updates/
+PORT = 20023
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-fs
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+DELAY = YES
+CONTENT_CACHING = YES
+CONTENT_PUSHING = YES
+UNIXPATH = /tmp/test-service-fs-20
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
+MAX_PENDING_REQUESTS = 65536
+MIN_MIGRATION_DELAY = 100 ms
+EXPECTED_NEIGHBOUR_COUNT = 128
+
+[vpn]
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-vpn
+IPV6ADDR = 1234::1
+IPV6PREFIX = 32
+IPV4ADDR = 10.11.10.1
+IPV4MASK = 255.255.0.0
+VIRTDNS = 10.11.10.2
+VIRTDNS6 = 1234::17
+IFNAME = vpn-gnunet
+
+[exit]
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-exit
+IPV6ADDR = 1234:1::1
+IPV6PREFIX = 32
+IPV4ADDR = 10.10.1.1
+IPV4MASK = 255.255.0.0
+IFNAME = exit-gnunet
+ENABLE_UDP = NO
+ENABLE_TCP = NO
+
+[dns]
+AUTOSTART = YES
+PORT = 0
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dns
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-dns-19
+PROVIDE_EXIT = NO
+
+[arm]
+PORT = 20022
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-arm
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+DEFAULTSERVICES = topology hostlist
+UNIXPATH = /tmp/test-service-arm-18
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[hostlist]
+HTTPPORT = 8080
+HOME = $SERVICEHOME
+HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-daemon-hostlist
+OPTIONS = -b
+SERVERS = http://v9.gnunet.org:58080/
+HTTP-PROXY =
+
+[core]
+AUTOSTART = YES
+PORT = 20021
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-core
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-core-17
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[nat]
+EXTERNAL_ADDRESS = 127.0.0.1
+INTERNAL_ADDRESS = 127.0.0.1
+BINDTO = 127.0.0.1
+BEHIND_NAT = NO
+PUNCHED_NAT = NO
+ENABLE_UPNP = NO
+USE_LOCALADDR = YES
+USE_HOSTNAME = NO
+ENABLE_ICMP_CLIENT = NO
+ENABLE_ICMP_SERVER = NO
+DISABLEV6 = YES
+RETURN_LOCAL_ADDRESSES = NO
+HOSTNAME_DNS_FREQUENCY = 1200000
+IFC_SCAN_FREQUENCY = 3000000
+DYNDNS_FREQUENCY = 140000
+
+[gnunet-nat-server]
+HOSTNAME = gnunet.org
+PORT = 20020
+
+[statistics]
+AUTOSTART = YES
+PORT = 20019
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-statistics
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+UNIXPATH = /tmp/test-service-statistics-16
+UNIX_MATCH_UID = NO
+UNIX_MATCH_GID = YES
+
+[dht]
+AUTOSTART = YES
+PORT = 20018
+HOSTNAME = localhost
+HOME = $SERVICEHOME
+CONFIG = $DEFAULTCONFIG
+BINARY = gnunet-service-dht
+ACCEPT_FROM = 127.0.0.1;
+ACCEPT_FROM6 = ::1;
+BUCKET_SIZE = 4
+UNIXPATH = /tmp/test-service-dht-15
+UNIX_MATCH_UID = YES
+UNIX_MATCH_GID = YES
+
+[dhtcache]
+DATABASE = sqlite
+QUOTA = 1 MB
+
Added: gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
(rev 0)
+++ gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
2011-12-08 16:16:24 UTC (rev 18517)
@@ -0,0 +1,110 @@
address@hidden@
+# This file is part of GNUnet.
+# (C) 2010 Christian Grothoff (and other contributing authors)
+#
+# GNUnet is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published
+# by the Free Software Foundation; either version 2, or (at your
+# option) any later version.
+#
+# GNUnet is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNUnet; see the file COPYING. If not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+#
+#
+import sys
+import os
+import subprocess
+import re
+import shutil
+
+#
+# This test tests if a fresh peer bootstraps from a hostlist server and then
+# successfully connects to the server
+#
+
+#definitions
+
+def vpfrint (msg):
+ if verbose == True:
+ print msg
+
+
+testname = "test_integration_bootstrap_and_connect"
+verbose = True
+
+# setup
+
+srcdir = "../.."
+gnunet_pyexpect_dir = os.path.join (srcdir, "contrib")
+if gnunet_pyexpect_dir not in sys.path:
+ sys.path.append (gnunet_pyexpect_dir)
+
+from gnunet_pyexpect import pexpect
+
+if os.name == 'posix':
+ gnunetarm = 'gnunet-arm'
+elif os.name == 'nt':
+ gnunetarm = 'gnunet-arm.exe'
+
+if os.name == "nt":
+ shutil.rmtree (os.path.join (os.getenv ("TEMP"), testname), True)
+else:
+ shutil.rmtree ("/tmp/" + testname, True)
+
+vpfrint ("Running " + testname)
+
+
+
+# start nodes
+
+vpfrint ("Starting bootstrap server & client")
+try:
+ server = subprocess.Popen ([gnunetarm, '-sq', '-c',
'./confs/c_bootstrap_server.conf'])
+ server.communicate ()
+except OSError:
+ print "Can not start bootstrap server, exiting..."
+ exit (1)
+try:
+ client = subprocess.Popen ([gnunetarm, '-sq', '-c',
'confs/c_no_nat_client.conf'])
+ client.communicate ()
+except OSError:
+ print "Can not start bootstrap client, exiting..."
+ exit (1)
+vpfrint ("Bootstrap server & client started")
+
+
+import time
+time.sleep(5)
+
+# shutdown
+vpfrint ("Shutting down bootstrap server")
+try:
+ server = subprocess.Popen ([gnunetarm, '-eq', '-c',
'./confs/c_bootstrap_server.conf'])
+ server.communicate ()
+except OSError:
+ print "Can not stop bootstrap server, exiting..."
+ exit (1)
+try:
+ client = subprocess.Popen ([gnunetarm, '-eq', '-c',
'confs/c_no_nat_client.conf'])
+ client.communicate ()
+except OSError:
+ print "Can not stop bootstrap client, exiting..."
+ exit (1)
+vpfrint ("Bootstrap server & client stopped")
+
+# clean up
+
+if os.name == "nt":
+ shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"),
True)
+else:
+ shutil.rmtree ("/tmp/gnunet-test-fs-py-ns", True)
+
+exit (0)
+
Property changes on:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
___________________________________________________________________
Added: svn:executable
+ *
Modified: gnunet/src/integration-tests/test_integration_clique.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_clique.py.in 2011-12-08
16:15:03 UTC (rev 18516)
+++ gnunet/src/integration-tests/test_integration_clique.py.in 2011-12-08
16:16:24 UTC (rev 18517)
@@ -17,13 +17,17 @@
# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
#
-# Testcase for file-sharing command-line tools (namespaces)
+#
import sys
import os
import subprocess
import re
import shutil
+
+testname = "test_integration_clique"
+verbose = True
+
srcdir = "../.."
gnunet_pyexpect_dir = os.path.join (srcdir, "contrib")
if gnunet_pyexpect_dir not in sys.path:
@@ -31,29 +35,24 @@
from gnunet_pyexpect import pexpect
-exit ()
-
-
-# dummy copied from fs
-
if os.name == 'posix':
- pseudonym = 'gnunet-pseudonym'
gnunetarm = 'gnunet-arm'
- publish = 'gnunet-publish'
- unindex = 'gnunet-unindex'
- search = 'gnunet-search'
elif os.name == 'nt':
- pseudonym = 'gnunet-pseudonym.exe'
gnunetarm = 'gnunet-arm.exe'
- publish = 'gnunet-publish.exe'
- unindex = 'gnunet-unindex.exe'
- search = 'gnunet-search.exe'
if os.name == "nt":
- shutil.rmtree (os.path.join (os.getenv ("TEMP"), "gnunet-test-fs-py-ns"),
True)
+ shutil.rmtree (os.path.join (os.getenv ("TEMP"), testname), True)
else:
- shutil.rmtree ("/tmp/gnunet-test-fs-py-ns", True)
+ shutil.rmtree ("/tmp/" + testname, True)
+if verbose == True:
+ print "Running " + testname
+
+
+
+
+exit ()
+# dummy copied from fs
arm = subprocess.Popen ([gnunetarm, '-sq', '-c',
'test_gnunet_fs_ns_data.conf'])
arm.communicate ()
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18517 - in gnunet/src/integration-tests: . confs,
gnunet <=