diff options
author | Christian Grothoff <christian@grothoff.org> | 2009-10-31 21:57:40 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2009-10-31 21:57:40 +0000 |
commit | d5128d1f3cbaf2e495ae1325b5c133cafca9437e (patch) | |
tree | 71fde6b613f94a097245be708c8cf376eea7cdec | |
parent | cace791cada565397c615a2e55a9f28b60e4037a (diff) | |
download | gnunet-d5128d1f3cbaf2e495ae1325b5c133cafca9437e.tar.gz gnunet-d5128d1f3cbaf2e495ae1325b5c133cafca9437e.zip |
group test works
-rw-r--r-- | BUGS | 4 | ||||
-rw-r--r-- | TODO | 6 | ||||
-rw-r--r-- | src/testing/Makefile.am | 15 | ||||
-rw-r--r-- | src/testing/test_testing_connect.c | 4 | ||||
-rw-r--r-- | src/testing/test_testing_group.c | 119 |
5 files changed, 137 insertions, 11 deletions
@@ -133,4 +133,6 @@ sane end-user should care about this codebase yet anyway. | |||
133 | * HOSTLIST: | 133 | * HOSTLIST: |
134 | - implement advertising of hostlist URL | 134 | - implement advertising of hostlist URL |
135 | - implement learning of hostlist URLs | 135 | - implement learning of hostlist URLs |
136 | 136 | * TESTING: | |
137 | - consider changing API for peer-group termination to | ||
138 | call continuation when done | ||
@@ -12,12 +12,6 @@ away), in order in which they will likely be done: | |||
12 | * UPNP [Milan] | 12 | * UPNP [Milan] |
13 | 13 | ||
14 | Urgent items (before announcing ng.gnunet.org): | 14 | Urgent items (before announcing ng.gnunet.org): |
15 | * TESTING (needed for DV, DHT, Topology) | ||
16 | - implement library for local testing | ||
17 | + consider changing API for peer-group termination to | ||
18 | call continuation when done | ||
19 | - implement testcases for library | ||
20 | + test group start | ||
21 | * TEST: | 15 | * TEST: |
22 | - topology (needs TESTING) | 16 | - topology (needs TESTING) |
23 | - hostlist (maybe easier with TESTING?) | 17 | - hostlist (maybe easier with TESTING?) |
diff --git a/src/testing/Makefile.am b/src/testing/Makefile.am index e62795a92..18144c514 100644 --- a/src/testing/Makefile.am +++ b/src/testing/Makefile.am | |||
@@ -22,9 +22,14 @@ libgnunettesting_la_LIBADD = $(XLIB) \ | |||
22 | 22 | ||
23 | check_PROGRAMS = \ | 23 | check_PROGRAMS = \ |
24 | test_testing \ | 24 | test_testing \ |
25 | test_testing_connect | 25 | test_testing_connect \ |
26 | test_testing_group | ||
26 | 27 | ||
27 | TESTS = $(check_PROGRAMS) | 28 | TESTS = \ |
29 | test_testing \ | ||
30 | test_testing_connect \ | ||
31 | test_testing_group | ||
32 | #$(check_PROGRAMS) | ||
28 | 33 | ||
29 | test_testing_SOURCES = \ | 34 | test_testing_SOURCES = \ |
30 | test_testing.c | 35 | test_testing.c |
@@ -38,6 +43,12 @@ test_testing_connect_LDADD = \ | |||
38 | $(top_builddir)/src/testing/libgnunettesting.la \ | 43 | $(top_builddir)/src/testing/libgnunettesting.la \ |
39 | $(top_builddir)/src/util/libgnunetutil.la | 44 | $(top_builddir)/src/util/libgnunetutil.la |
40 | 45 | ||
46 | test_testing_group_SOURCES = \ | ||
47 | test_testing_group.c | ||
48 | test_testing_group_LDADD = \ | ||
49 | $(top_builddir)/src/testing/libgnunettesting.la \ | ||
50 | $(top_builddir)/src/util/libgnunetutil.la | ||
51 | |||
41 | EXTRA_DIST = \ | 52 | EXTRA_DIST = \ |
42 | test_testing_data.conf \ | 53 | test_testing_data.conf \ |
43 | test_testing_connect_peer1.conf \ | 54 | test_testing_connect_peer1.conf \ |
diff --git a/src/testing/test_testing_connect.c b/src/testing/test_testing_connect.c index b6a2d859a..431b63963 100644 --- a/src/testing/test_testing_connect.c +++ b/src/testing/test_testing_connect.c | |||
@@ -157,7 +157,7 @@ check () | |||
157 | GNUNET_GETOPT_OPTION_END | 157 | GNUNET_GETOPT_OPTION_END |
158 | }; | 158 | }; |
159 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, | 159 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, |
160 | argv, "test-testing", "nohelp", | 160 | argv, "test-testing-connect", "nohelp", |
161 | options, &run, &ok); | 161 | options, &run, &ok); |
162 | return ok; | 162 | return ok; |
163 | } | 163 | } |
@@ -167,7 +167,7 @@ main (int argc, char *argv[]) | |||
167 | { | 167 | { |
168 | int ret; | 168 | int ret; |
169 | 169 | ||
170 | GNUNET_log_setup ("test-testing", | 170 | GNUNET_log_setup ("test-testing-connect", |
171 | #if VERBOSE | 171 | #if VERBOSE |
172 | "DEBUG", | 172 | "DEBUG", |
173 | #else | 173 | #else |
diff --git a/src/testing/test_testing_group.c b/src/testing/test_testing_group.c new file mode 100644 index 000000000..1d38ef5ec --- /dev/null +++ b/src/testing/test_testing_group.c | |||
@@ -0,0 +1,119 @@ | |||
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 2, 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 testing/test_testing_group.c | ||
22 | * @brief testcase for functions to connect two peers in testing.c | ||
23 | */ | ||
24 | #include "platform.h" | ||
25 | #include "gnunet_testing_lib.h" | ||
26 | |||
27 | #define VERBOSE GNUNET_NO | ||
28 | |||
29 | |||
30 | /** | ||
31 | * How long until we give up on connecting the peers? | ||
32 | */ | ||
33 | #define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 60) | ||
34 | |||
35 | |||
36 | static int ok; | ||
37 | |||
38 | static int peers_left; | ||
39 | |||
40 | static struct GNUNET_TESTING_PeerGroup *pg; | ||
41 | |||
42 | static struct GNUNET_SCHEDULER_Handle *sched; | ||
43 | |||
44 | |||
45 | static void my_cb(void *cls, | ||
46 | const struct GNUNET_PeerIdentity *id, | ||
47 | const struct GNUNET_CONFIGURATION_Handle *cfg, | ||
48 | struct GNUNET_TESTING_Daemon *d, | ||
49 | const char *emsg) | ||
50 | { | ||
51 | GNUNET_assert (id != NULL); | ||
52 | peers_left--; | ||
53 | if (peers_left == 0) | ||
54 | { | ||
55 | GNUNET_TESTING_daemons_stop (pg); | ||
56 | ok = 0; | ||
57 | } | ||
58 | } | ||
59 | |||
60 | |||
61 | static void | ||
62 | run (void *cls, | ||
63 | struct GNUNET_SCHEDULER_Handle *s, | ||
64 | char *const *args, | ||
65 | const char *cfgfile, | ||
66 | const struct GNUNET_CONFIGURATION_Handle *cfg) | ||
67 | { | ||
68 | sched = s; | ||
69 | ok = 1; | ||
70 | #if VERBOSE | ||
71 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | ||
72 | "Starting daemons.\n"); | ||
73 | #endif | ||
74 | peers_left = 4; | ||
75 | pg = GNUNET_TESTING_daemons_start (sched, cfg, | ||
76 | peers_left, | ||
77 | &my_cb, NULL, NULL); | ||
78 | GNUNET_assert (pg != NULL); | ||
79 | } | ||
80 | |||
81 | static int | ||
82 | check () | ||
83 | { | ||
84 | char *const argv[] = { "test-testing", | ||
85 | "-c", | ||
86 | "test_testing_data.conf", | ||
87 | #if VERBOSE | ||
88 | "-L", "DEBUG", | ||
89 | #endif | ||
90 | NULL | ||
91 | }; | ||
92 | struct GNUNET_GETOPT_CommandLineOption options[] = { | ||
93 | GNUNET_GETOPT_OPTION_END | ||
94 | }; | ||
95 | GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, | ||
96 | argv, "test-testing-group", "nohelp", | ||
97 | options, &run, &ok); | ||
98 | return ok; | ||
99 | } | ||
100 | |||
101 | int | ||
102 | main (int argc, char *argv[]) | ||
103 | { | ||
104 | int ret; | ||
105 | |||
106 | GNUNET_log_setup ("test-testing-group", | ||
107 | #if VERBOSE | ||
108 | "DEBUG", | ||
109 | #else | ||
110 | "WARNING", | ||
111 | #endif | ||
112 | NULL); | ||
113 | ret = check (); | ||
114 | sleep (1); | ||
115 | GNUNET_DISK_directory_remove ("/tmp/test-gnunet-testing"); | ||
116 | return ret; | ||
117 | } | ||
118 | |||
119 | /* end of test_testing_group.c */ | ||