summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMatthias Wachs <wachs@net.in.tum.de>2011-10-17 16:27:29 +0000
committerMatthias Wachs <wachs@net.in.tum.de>2011-10-17 16:27:29 +0000
commitcfc4a427b24f0ab204fe8333a8c9eaa9ac9a5b41 (patch)
tree294c5d50e4bf27c9d17f40c495313e3d7a3d0b57 /src
parent62979559c33059ac59cd2a28393749f2552c781e (diff)
all tests use generated configs and pass on my system
Diffstat (limited to 'src')
-rw-r--r--src/transport/test_quota_compliance.c7
-rw-r--r--src/transport/test_quota_compliance_http_peer1.conf4
-rw-r--r--src/transport/test_quota_compliance_http_peer2.conf4
-rw-r--r--src/transport/test_quota_compliance_https_peer1.conf4
-rw-r--r--src/transport/test_quota_compliance_https_peer2.conf4
-rw-r--r--src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf4
-rw-r--r--src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf4
-rw-r--r--src/transport/test_quota_compliance_tcp_peer1.conf4
-rw-r--r--src/transport/test_quota_compliance_tcp_peer2.conf4
-rw-r--r--src/transport/test_quota_compliance_udp_peer1.conf4
-rw-r--r--src/transport/test_quota_compliance_udp_peer2.conf6
-rw-r--r--src/transport/test_quota_compliance_unix_peer1.conf4
-rw-r--r--src/transport/test_quota_compliance_unix_peer2.conf4
13 files changed, 4 insertions, 53 deletions
diff --git a/src/transport/test_quota_compliance.c b/src/transport/test_quota_compliance.c
index 493352512..a8a780ff6 100644
--- a/src/transport/test_quota_compliance.c
+++ b/src/transport/test_quota_compliance.c
@@ -269,7 +269,8 @@ notify_receive (void *cls, const struct GNUNET_PeerIdentity *peer,
if (die_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (die_task);
test_failed = GNUNET_YES;
- die_task = GNUNET_SCHEDULER_add_now (&end_badly, NULL);
+ die_task = GNUNET_SCHEDULER_add_now (&end_badly,
+ NULL);
return;
}
#if VERBOSE
@@ -498,13 +499,13 @@ run_measurement (unsigned long long p1_quota_in, unsigned long long p1_quota_out
"Generated config file `%s'\n",
gen_cfg_p2);
- p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p1, 1,
+ p1 = GNUNET_TRANSPORT_TESTING_start_peer (tth, gen_cfg_p1, 1,
&notify_receive,
&notify_connect, &notify_disconnect,
&start_cb,
NULL);
- p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, cfg_file_p2, 2,
+ p2 = GNUNET_TRANSPORT_TESTING_start_peer (tth, gen_cfg_p2, 2,
&notify_receive,
&notify_connect, &notify_disconnect,
&start_cb,
diff --git a/src/transport/test_quota_compliance_http_peer1.conf b/src/transport/test_quota_compliance_http_peer1.conf
index 06d0e275d..872a75365 100644
--- a/src/transport/test_quota_compliance_http_peer1.conf
+++ b/src/transport/test_quota_compliance_http_peer1.conf
@@ -3,10 +3,6 @@
SERVICEHOME = /tmp/test_quota_compliance_peer1
DEFAULTCONFIG = test_quota_compliance_http_peer1.conf
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
[transport-http]
PORT = 4010
DEBUG = NO
diff --git a/src/transport/test_quota_compliance_http_peer2.conf b/src/transport/test_quota_compliance_http_peer2.conf
index d3a039cfa..256dc61eb 100644
--- a/src/transport/test_quota_compliance_http_peer2.conf
+++ b/src/transport/test_quota_compliance_http_peer2.conf
@@ -3,10 +3,6 @@
SERVICEHOME = /tmp/test_quota_compliance_peer2
DEFAULTCONFIG = test_quota_compliance_http_peer2.conf
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
[transport-http]
PORT = 3010
DEBUG = NO
diff --git a/src/transport/test_quota_compliance_https_peer1.conf b/src/transport/test_quota_compliance_https_peer1.conf
index 8859304bb..47f93096c 100644
--- a/src/transport/test_quota_compliance_https_peer1.conf
+++ b/src/transport/test_quota_compliance_https_peer1.conf
@@ -3,10 +3,6 @@
SERVICEHOME = /tmp/test_quota_compliance_peer1/
DEFAULTCONFIG = test_quota_compliance_https_peer1.conf
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
[transport-https]
PORT = 4001
CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
diff --git a/src/transport/test_quota_compliance_https_peer2.conf b/src/transport/test_quota_compliance_https_peer2.conf
index afe4824bd..79bf0331f 100644
--- a/src/transport/test_quota_compliance_https_peer2.conf
+++ b/src/transport/test_quota_compliance_https_peer2.conf
@@ -3,10 +3,6 @@
SERVICEHOME = /tmp/test_quota_compliance_peer2
DEFAULTCONFIG = test_quota_compliance_https_peer2.conf
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
[transport-https]
PORT = 3001
CRYPTO_INIT = NONE:+VERS-TLS1.0:+ARCFOUR-128:+SHA1:+RSA:+COMP-NULL
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
index 47f6a639c..a7bac62ca 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer1.conf
@@ -3,10 +3,6 @@
SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer1.conf
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
[transport-tcp]
PORT = 4094
diff --git a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
index d9c182be5..18295ac60 100644
--- a/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_asymmetric_peer2.conf
@@ -3,10 +3,6 @@
SERVICEHOME = /tmp/test-transport/quota-tcp-p2/
DEFAULTCONFIG = test_quota_compliance_tcp_asymmetric_peer2.conf
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
[transport-tcp]
PORT = 12015
TIMEOUT = 5000
diff --git a/src/transport/test_quota_compliance_tcp_peer1.conf b/src/transport/test_quota_compliance_tcp_peer1.conf
index f92d9cd98..ff63514b1 100644
--- a/src/transport/test_quota_compliance_tcp_peer1.conf
+++ b/src/transport/test_quota_compliance_tcp_peer1.conf
@@ -3,10 +3,6 @@
SERVICEHOME = /tmp/test-transport/quota-tcp-p1/
DEFAULTCONFIG = test_quota_compliance_tcp_peer1.conf
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
[transport-tcp]
PORT = 4094
diff --git a/src/transport/test_quota_compliance_tcp_peer2.conf b/src/transport/test_quota_compliance_tcp_peer2.conf
index 5fe5d070e..476507588 100644
--- a/src/transport/test_quota_compliance_tcp_peer2.conf
+++ b/src/transport/test_quota_compliance_tcp_peer2.conf
@@ -3,10 +3,6 @@
SERVICEHOME = /tmp/test-transport/api-tcp-p2/
DEFAULTCONFIG = test_quota_compliance_tcp_peer2.conf
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
[transport-tcp]
PORT = 12015
TIMEOUT = 5000
diff --git a/src/transport/test_quota_compliance_udp_peer1.conf b/src/transport/test_quota_compliance_udp_peer1.conf
index 3e52c2167..fceee7bcd 100644
--- a/src/transport/test_quota_compliance_udp_peer1.conf
+++ b/src/transport/test_quota_compliance_udp_peer1.conf
@@ -3,10 +3,6 @@
SERVICEHOME = /tmp/test_quota_compliance_peer1/
DEFAULTCONFIG = test_quota_compliance_udp_peer1.conf
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
[transport-udp]
PORT = 4368
MAX_BPS = 50000000
diff --git a/src/transport/test_quota_compliance_udp_peer2.conf b/src/transport/test_quota_compliance_udp_peer2.conf
index d6d928f7c..4b58c934f 100644
--- a/src/transport/test_quota_compliance_udp_peer2.conf
+++ b/src/transport/test_quota_compliance_udp_peer2.conf
@@ -1,14 +1,8 @@
@INLINE@ template_cfg_peer2.conf
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
[PATHS]
SERVICEHOME = /tmp/test_quota_compliance_peer2
DEFAULTCONFIG = test_quota_compliance_udp_peer2.conf
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
[transport-udp]
PORT = 3368
MAX_BPS = 50000000
diff --git a/src/transport/test_quota_compliance_unix_peer1.conf b/src/transport/test_quota_compliance_unix_peer1.conf
index 20844227a..60e656bad 100644
--- a/src/transport/test_quota_compliance_unix_peer1.conf
+++ b/src/transport/test_quota_compliance_unix_peer1.conf
@@ -3,10 +3,6 @@
SERVICEHOME = /tmp/test_quota_compliance_peer1/
DEFAULTCONFIG = test_quota_compliance_unix_peer1.conf
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
[transport-unix]
PORT = 12120
diff --git a/src/transport/test_quota_compliance_unix_peer2.conf b/src/transport/test_quota_compliance_unix_peer2.conf
index 332226a84..b4f0b648a 100644
--- a/src/transport/test_quota_compliance_unix_peer2.conf
+++ b/src/transport/test_quota_compliance_unix_peer2.conf
@@ -3,10 +3,6 @@
SERVICEHOME = /tmp/test_quota_compliance_peer2
DEFAULTCONFIG = test_quota_compliance_unix_peer2.conf
-[core]
-TOTAL_QUOTA_IN = 10000
-TOTAL_QUOTA_OUT = 10000
-
[transport-unix]
PORT = 12136