clique test

removed unusued confs, tests 

3 files changed, 77 insertions, 118 deletions

diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf
index 731331ba3..cb69fa4fe 100644
--- a/src/integration-tests/confs/c_no_nat_client.conf
+++ b/src/integration-tests/confs/c_no_nat_client.conf
@@ -82,7 +82,6 @@ UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20
 PORT = 20023
 
 [vpn]
-BINARY = gnunet-service-vpn
 UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29
 
 [dv]
diff --git a/src/integration-tests/confs/c_no_nat_client_2.conf b/src/integration-tests/confs/c_no_nat_client_2.conf
index b475ff284..9da32fe14 100644
--- a/src/integration-tests/confs/c_no_nat_client_2.conf
+++ b/src/integration-tests/confs/c_no_nat_client_2.conf
@@ -1,95 +1,117 @@
 @INLINE@ confs/test_defaults.conf
 
+[PATHS]
+GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
+
+[PEER]
+PRIVATE_KEY = hostkeys/c_no_nat_client_2
+
+
+[transport]
+PLUGINS = tcp udp http_client https_client 
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-22
+PORT = 20039
+
+[transport-tcp]
+PORT = 20038
+ADVERTISED_PORT = 20038
+
+[transport-udp]
+PORT = 20027
+BROADCAST_INTERVAL = 30 s
+
+[hostlist]
+SERVERS = http://localhost:8080/
+
+[nat]
+BEHIND_NAT = NO
+DISABLEV6 = NO
+
+
 [arm]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-32
-PORT = 20040
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-18
+PORT = 20022
+
+[namestore]
+AUTOSTART = YES
 
 [dns]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-33
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dns-19
+
+[consensus]
+AUTOSTART = YES
 
 [lockmanager]
 AUTOSTART = YES
 
 [core]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-31
-PORT = 20039
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-17
+PORT = 20021
 
 [ats]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-37
-PORT = 20048
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-23
+WAN_QUOTA_IN = 64 KiB
+WAN_QUOTA_OUT = 64 KiB
+PORT = 20030
 
 [mesh]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-41
-PORT = 20052
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-mesh-27
+PORT = 20034
 
 [datastore]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-39
-PORT = 20050
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-25
+PORT = 20032
 
 [resolver]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-42
-PORT = 20053
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-28
+PORT = 20035
 
 [dht]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-29
-PORT = 20036
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-15
+PORT = 20018
 
-[nat]
-BEHIND_NAT = NO
+[dhtcache]
+DATABASE = heap
+QUOTA = 50 MB
 
 [gnunet-nat-server]
-PORT = 20038
+PORT = 20020
 
 [fs]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-34
-PORT = 20041
-
-[transport]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-36
-PORT = 20047
-
-[transport-tcp]
-PORT = 20046
-ADVERTISED_PORT = 20046
-
-[transport-udp]
-PORT = 20045
-
-[hostlist]
-SERVERS = http://localhost:8080/
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-20
+PORT = 20023
 
 [vpn]
-UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn.sock
+UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-vpn-29
 
 [dv]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_c-2
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-b_no_nat_c-1
 
 [peerinfo]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-38
-PORT = 20049
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-24
+USE_INCLUDED_HELLOS = YES
+PORT = 20031
 
 [statistics]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-30
-PORT = 20037
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/c_no_nat_client_2/
-DEFAULTCONFIG = c_no_nat_client_2.conf
-
-[PEER]
-PRIVATE_KEY = hostkeys/c_no_nat_client_2
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-statistics-16
+PORT = 20019
 
 [template]
-PORT = 20042
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-35
+PORT = 20024
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-template-21
 
 [nse]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-40
-PORT = 20051
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-26
+UNIX_MATCH_UID = NO
+WORKBITS = 22
+PORT = 20033
+
+[gns]
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-gns-35
+PORT = 20038
 
-[transport-http]
-PORT = 20044
+[dv]
+UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dv-36
+PORT = 20039
 
-[transport-https]
-PORT = 20043
 
diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf
deleted file mode 100644
index 54d8b050d..000000000
--- a/src/integration-tests/confs/c_normal_client_tcp.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-@INLINE@ confs/test_defaults.conf
-
-[arm]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-arm-46
-PORT = 20058
-
-[core]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-core-45
-PORT = 20057
-
-[ats]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-ats-51
-PORT = 20066
-
-[datastore]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-datastore-53
-PORT = 20068
-
-[resolver]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-resolver-56
-PORT = 20071
-
-[dht]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-dht-43
-PORT = 20054
-
-[fs]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-fs-48
-PORT = 20059
-
-[transport]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-transport-50
-PORT = 20065
-
-[transport-tcp]
-PORT = 0
-ADVERTISED_PORT = 20064
-
-[transport-udp]
-PORT = 0
-
-[peerinfo]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-peerinfo-52
-USE_INCLUDED_HELLOS = YES
-PORT = 20067
-
-[PATHS]
-GNUNET_TEST_HOME = /tmp/c_normal_client
-
-[nse]
-UNIXPATH = $GNUNET_RUNTIME_DIR/test-service-nse-54
-PORT = 20069
-
-[gnunetd]
-HOSTKEY = hostkeys/0002-hostkey
-
-[transport-http]
-PORT = 0
-
-[transport-https]
-PORT = 0
-