diff options
author | Matthias Wachs <wachs@net.in.tum.de> | 2012-09-03 09:36:30 +0000 |
---|---|---|
committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-09-03 09:36:30 +0000 |
commit | f2c031e12a290068d945f8fbb812113fe28c17fb (patch) | |
tree | 5eac047932e2684742ddf2e4f6b4892fb080fab6 /src/integration-tests | |
parent | 87b3e500bda3fdf9abe1ad8f7a1544a3ecb6496c (diff) | |
download | gnunet-f2c031e12a290068d945f8fbb812113fe28c17fb.tar.gz gnunet-f2c031e12a290068d945f8fbb812113fe28c17fb.zip |
- remove unused test
Diffstat (limited to 'src/integration-tests')
-rw-r--r-- | src/integration-tests/Makefile.am | 12 | ||||
-rw-r--r-- | src/integration-tests/test_connection_stability.c | 126 | ||||
-rw-r--r-- | src/integration-tests/test_connection_stability.conf | 84 |
3 files changed, 1 insertions, 221 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index 14649596d..ed0e0d727 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am | |||
@@ -33,9 +33,6 @@ check_SCRIPTS = \ | |||
33 | endif | 33 | endif |
34 | # test_integration_disconnect.py | 34 | # test_integration_disconnect.py |
35 | 35 | ||
36 | check_PROGRAMS = \ | ||
37 | test_connection_stability | ||
38 | |||
39 | 36 | ||
40 | if ENABLE_TEST_RUN | 37 | if ENABLE_TEST_RUN |
41 | TESTS = \ | 38 | TESTS = \ |
@@ -81,7 +78,7 @@ test_integration_disconnect.py: test_integration_disconnect.py.in Makefile | |||
81 | $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py | 78 | $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py |
82 | chmod +x test_integration_disconnect.py | 79 | chmod +x test_integration_disconnect.py |
83 | 80 | ||
84 | #test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in Makefile | 81 | #test_integration_disconnect_nat.py: test_integration_disconnect_nat.py.in Matest_connection_stabilitykefile |
85 | # $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in > test_integration_disconnect_nat.py | 82 | # $(do_subst) < $(srcdir)/test_integration_disconnect_nat.py.in > test_integration_disconnect_nat.py |
86 | # chmod +x test_integration_disconnect_nat.py | 83 | # chmod +x test_integration_disconnect_nat.py |
87 | 84 | ||
@@ -113,12 +110,6 @@ test_integration_connection_values_tcp_udp_http.py: test_integration_connection_ | |||
113 | $(do_subst) < $(srcdir)/test_integration_connection_values_tcp_udp_http.py.in > test_integration_connection_values_tcp_udp_http.py | 110 | $(do_subst) < $(srcdir)/test_integration_connection_values_tcp_udp_http.py.in > test_integration_connection_values_tcp_udp_http.py |
114 | chmod +x test_integration_connection_values_tcp_udp_http.py | 111 | chmod +x test_integration_connection_values_tcp_udp_http.py |
115 | 112 | ||
116 | test_connection_stability_SOURCES = \ | ||
117 | test_connection_stability.c | ||
118 | test_connection_stability_LDADD = \ | ||
119 | $(top_builddir)/src/testing_old/libgnunettesting_old.la \ | ||
120 | $(top_builddir)/src/util/libgnunetutil.la | ||
121 | |||
122 | 113 | ||
123 | EXTRA_DIST = \ | 114 | EXTRA_DIST = \ |
124 | gnunet_testing.py.in \ | 115 | gnunet_testing.py.in \ |
@@ -147,7 +138,6 @@ EXTRA_DIST = \ | |||
147 | confs/c_no_nat_client_http_2.conf \ | 138 | confs/c_no_nat_client_http_2.conf \ |
148 | confs/c_no_nat_client_unix.conf \ | 139 | confs/c_no_nat_client_unix.conf \ |
149 | confs/c_no_nat_client_unix_2.conf \ | 140 | confs/c_no_nat_client_unix_2.conf \ |
150 | test_connection_stability.conf \ | ||
151 | hostkeys/0000-hostkey \ | 141 | hostkeys/0000-hostkey \ |
152 | hostkeys/0001-hostkey \ | 142 | hostkeys/0001-hostkey \ |
153 | hostkeys/0002-hostkey \ | 143 | hostkeys/0002-hostkey \ |
diff --git a/src/integration-tests/test_connection_stability.c b/src/integration-tests/test_connection_stability.c deleted file mode 100644 index ce6568b78..000000000 --- a/src/integration-tests/test_connection_stability.c +++ /dev/null | |||
@@ -1,126 +0,0 @@ | |||
1 | /* | ||
2 | This file is part of GNUnet. | ||
3 | (C) 2009 Christian Grothoff (and other contributing authors) | ||
4 | |||
5 | GNUnet is free software; you can redistribute it and/or modify | ||
6 | it under the terms of the GNU General Public License as published | ||
7 | by the Free Software Foundation; either version 3, or (at your | ||
8 | option) any later version. | ||
9 | |||
10 | GNUnet is distributed in the hope that it will be useful, but | ||
11 | WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
13 | General Public License for more details. | ||
14 | |||
15 | You should have received a copy of the GNU General Public License | ||
16 | along with GNUnet; see the file COPYING. If not, write to the | ||
17 | Free Software Foundation, Inc., 59 Temple Place - Suite 330, | ||
18 | Boston, MA 02111-1307, USA. | ||
19 | */ | ||
20 | /** | ||
21 | * @file integretion-tests/test_connection_stability.c | ||
22 | * @brief testcase for connection stability | ||
23 | */ | ||
24 | #include "platform.h" | ||
25 | #include "gnunet_testing_lib.h" | ||
26 | |||
27 | #define VERBOSE GNUNET_YES | ||
28 | |||
29 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300) | ||
30 | |||
31 | static int ok; | ||
32 | |||
33 | static void | ||
34 | end_cb (void *cls, const char *emsg) | ||
35 | { | ||
36 | if (emsg != NULL) | ||
37 | { | ||
38 | GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Ending with error: %s\n", emsg); | ||
39 | ok = 1; | ||
40 | } | ||
41 | else | ||
42 | { | ||
43 | #if VERBOSE | ||
44 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Daemon terminated, will now exit.\n"); | ||
45 | #endif | ||
46 | ok = 0; | ||
47 | } | ||
48 | } | ||
49 | |||
50 | |||
51 | |||
52 | void | ||
53 | do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) | ||
54 | { | ||
55 | struct GNUNET_TESTING_Daemon *d = cls; | ||
56 | |||
57 | GNUNET_TESTING_daemon_stop (d, TIMEOUT, &end_cb, NULL, GNUNET_YES, GNUNET_NO); | ||
58 | } | ||
59 | |||
60 | |||
61 | static void | ||
62 | my_cb (void *cls, const struct GNUNET_PeerIdentity *id, | ||
63 | const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
64 | struct GNUNET_TESTING_Daemon *d, const char *emsg) | ||
65 | { | ||
66 | GNUNET_assert (id != NULL); | ||
67 | #if VERBOSE | ||
68 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
69 | "Daemon `%s' started, will now stop it.\n", GNUNET_i2s (id)); | ||
70 | #endif | ||
71 | GNUNET_SCHEDULER_add_now (&do_shutdown, d); | ||
72 | } | ||
73 | |||
74 | |||
75 | static void | ||
76 | run (void *cls, char *const *args, const char *cfgfile, | ||
77 | const struct GNUNET_CONFIGURATION_Handle *cfg) | ||
78 | { | ||
79 | struct GNUNET_TESTING_Daemon *d; | ||
80 | |||
81 | ok = 1; | ||
82 | #if VERBOSE | ||
83 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemon.\n"); | ||
84 | #endif | ||
85 | d = GNUNET_TESTING_daemon_start (cfg, TIMEOUT, GNUNET_NO, NULL, NULL, 0, NULL, | ||
86 | NULL, NULL, &my_cb, NULL); | ||
87 | GNUNET_assert (d != NULL); | ||
88 | } | ||
89 | |||
90 | static int | ||
91 | check () | ||
92 | { | ||
93 | char *const argv[] = { "test_connection_stability", | ||
94 | "-c", | ||
95 | "test_connection_stability.conf", | ||
96 | #if VERBOSE | ||
97 | "-L", "DEBUG", | ||
98 | #endif | ||
99 | NULL | ||
100 | }; | ||
101 | struct GNUNET_GETOPT_CommandLineOption options[] = { | ||
102 | GNUNET_GETOPT_OPTION_END | ||
103 | }; | ||
104 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, | ||
105 | "test-testing", "nohelp", options, &run, &ok); | ||
106 | return ok; | ||
107 | } | ||
108 | |||
109 | int | ||
110 | main (int argc, char *argv[]) | ||
111 | { | ||
112 | int ret; | ||
113 | |||
114 | GNUNET_log_setup ("test_connection_stability", | ||
115 | #if VERBOSE | ||
116 | "DEBUG", | ||
117 | #else | ||
118 | "WARNING", | ||
119 | #endif | ||
120 | NULL); | ||
121 | ret = check (); | ||
122 | |||
123 | return ret; | ||
124 | } | ||
125 | |||
126 | /* end of test_connection_stability.c */ | ||
diff --git a/src/integration-tests/test_connection_stability.conf b/src/integration-tests/test_connection_stability.conf deleted file mode 100644 index a0400d819..000000000 --- a/src/integration-tests/test_connection_stability.conf +++ /dev/null | |||
@@ -1,84 +0,0 @@ | |||
1 | [PATHS] | ||
2 | SERVICEHOME = /tmp/test_connection_stability/ | ||
3 | DEFAULTCONFIG = test_connection_stability.conf | ||
4 | |||
5 | [resolver] | ||
6 | PORT = 2564 | ||
7 | |||
8 | [transport] | ||
9 | PORT = 2565 | ||
10 | PLUGINS = tcp | ||
11 | |||
12 | [arm] | ||
13 | PORT = 2566 | ||
14 | DEFAULTSERVICES = | ||
15 | |||
16 | [statistics] | ||
17 | PORT = 2567 | ||
18 | |||
19 | [transport-tcp] | ||
20 | PORT = 2568 | ||
21 | BINDTO = 127.0.0.1 | ||
22 | |||
23 | [peerinfo] | ||
24 | PORT = 2569 | ||
25 | |||
26 | [core] | ||
27 | PORT = 2570 | ||
28 | |||
29 | [testing] | ||
30 | WEAKRANDOM = YES | ||
31 | |||
32 | [testing_old] | ||
33 | NUM_PEERS = 5 | ||
34 | F2F = YES | ||
35 | HOSTKEYSFILE = ${DATADIR}/testing_hostkeys.dat | ||
36 | |||
37 | [dht] | ||
38 | AUTOSTART = NO | ||
39 | |||
40 | [nat] | ||
41 | DISABLEV6 = YES | ||
42 | ENABLE_UPNP = NO | ||
43 | BEHIND_NAT = NO | ||
44 | ALLOW_NAT = NO | ||
45 | INTERNAL_ADDRESS = 127.0.0.1 | ||
46 | EXTERNAL_ADDRESS = 127.0.0.1 | ||
47 | USE_LOCALADDR = NO | ||
48 | |||
49 | [dns] | ||
50 | AUTOSTART = NO | ||
51 | |||
52 | [nse] | ||
53 | AUTOSTART = NO | ||
54 | |||
55 | [mesh] | ||
56 | AUTOSTART = NO | ||
57 | |||
58 | [datastore] | ||
59 | AUTOSTART = NO | ||
60 | |||
61 | [fs] | ||
62 | AUTOSTART = NO | ||
63 | |||
64 | [dv] | ||
65 | AUTOSTART = NO | ||
66 | |||
67 | [chat] | ||
68 | AUTOSTART = NO | ||
69 | |||
70 | [vpn] | ||
71 | AUTOSTART = NO | ||
72 | |||
73 | [gns] | ||
74 | AUTOSTART = NO | ||
75 | |||
76 | [namestore] | ||
77 | AUTOSTART = NO | ||
78 | |||
79 | [lockmanager] | ||
80 | AUTOSTART = NO | ||
81 | |||
82 | [arm] | ||
83 | DEFAULTSERVICES = core | ||
84 | |||