diff options
Diffstat (limited to 'src/integration-tests')
29 files changed, 741 insertions, 664 deletions
diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index fb69e28..e42fb0c 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am @@ -21,7 +21,7 @@ noinst_SCRIPTS = \ test_integration_connection_values_tcp_udp.py \ test_integration_connection_values_tcp_udp_http.py -if HAVE_PYTHON_PEXPECT +if HAVE_PYTHON check_SCRIPTS = \ test_integration_bootstrap_and_connect.py \ test_integration_bootstrap_and_connect_and_disconnect.py \ @@ -33,14 +33,13 @@ check_SCRIPTS = \ endif # test_integration_disconnect.py -check_PROGRAMS = \ - test_connection_stability - +if HAVE_MHD if ENABLE_TEST_RUN TESTS = \ $(check_SCRIPTS) endif +endif connection_watchdog_SOURCE = \ connection_watchdog.c @@ -113,12 +112,6 @@ test_integration_connection_values_tcp_udp_http.py: test_integration_connection_ $(do_subst) < $(srcdir)/test_integration_connection_values_tcp_udp_http.py.in > test_integration_connection_values_tcp_udp_http.py chmod +x test_integration_connection_values_tcp_udp_http.py -test_connection_stability_SOURCES = \ - test_connection_stability.c -test_connection_stability_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - EXTRA_DIST = \ gnunet_testing.py.in \ @@ -135,6 +128,7 @@ EXTRA_DIST = \ test_integration_clique.py.in \ test_integration_clique_nat.py.in \ confs/c_bootstrap_server.conf \ + confs/c_bootstrap_server_w_massif.conf \ confs/c_nat_client.conf \ confs/c_no_nat_client_2.conf \ confs/c_no_nat_client.conf \ @@ -147,7 +141,6 @@ EXTRA_DIST = \ confs/c_no_nat_client_http_2.conf \ confs/c_no_nat_client_unix.conf \ confs/c_no_nat_client_unix_2.conf \ - test_connection_stability.conf \ hostkeys/0000-hostkey \ hostkeys/0001-hostkey \ hostkeys/0002-hostkey \ diff --git a/src/integration-tests/Makefile.in b/src/integration-tests/Makefile.in index 3e5e7dc..c9e19ba 100644 --- a/src/integration-tests/Makefile.in +++ b/src/integration-tests/Makefile.in @@ -1,9 +1,9 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +17,23 @@ VPATH = @srcdir@ +am__make_dryrun = \ + { \ + am__dry=no; \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ + | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ + *) \ + for am__flg in $$MAKEFLAGS; do \ + case $$am__flg in \ + *=*|--*) ;; \ + *n*) am__dry=yes; break;; \ + esac; \ + done;; \ + esac; \ + test $$am__dry = yes; \ + } pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,20 +54,20 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ noinst_PROGRAMS = connection_watchdog$(EXEEXT) -check_PROGRAMS = test_connection_stability$(EXEEXT) subdir = src/integration-tests DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/absolute-header.m4 \ $(top_srcdir)/m4/align.m4 $(top_srcdir)/m4/argz.m4 \ - $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libcurl.m4 \ - $(top_srcdir)/m4/libgcrypt.m4 $(top_srcdir)/m4/libtool.m4 \ - $(top_srcdir)/m4/libunistring.m4 $(top_srcdir)/m4/ltdl.m4 \ - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ - $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/glib-2.0.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/libcurl.m4 $(top_srcdir)/m4/libgcrypt.m4 \ + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/libunistring.m4 \ + $(top_srcdir)/m4/ltdl.m4 $(top_srcdir)/m4/ltoptions.m4 \ + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ + $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/po.m4 \ $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/acinclude.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -67,16 +84,9 @@ connection_watchdog_DEPENDENCIES = \ $(top_builddir)/src/core/libgnunetcore.la \ $(top_builddir)/src/transport/libgnunettransport.la \ $(top_builddir)/src/util/libgnunetutil.la -AM_V_lt = $(am__v_lt_$(V)) -am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent -am_test_connection_stability_OBJECTS = \ - test_connection_stability.$(OBJEXT) -test_connection_stability_OBJECTS = \ - $(am_test_connection_stability_OBJECTS) -test_connection_stability_DEPENDENCIES = \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la SCRIPTS = $(noinst_SCRIPTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp @@ -88,25 +98,29 @@ LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ $(AM_CFLAGS) $(CFLAGS) -AM_V_CC = $(am__v_CC_$(V)) -am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) am__v_CC_0 = @echo " CC " $@; -AM_V_at = $(am__v_at_$(V)) -am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ CCLD = $(CC) LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(AM_LDFLAGS) $(LDFLAGS) -o $@ -AM_V_CCLD = $(am__v_CCLD_$(V)) -am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) am__v_CCLD_0 = @echo " CCLD " $@; -AM_V_GEN = $(am__v_GEN_$(V)) -am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = connection_watchdog.c $(test_connection_stability_SOURCES) -DIST_SOURCES = connection_watchdog.c \ - $(test_connection_stability_SOURCES) +SOURCES = connection_watchdog.c +DIST_SOURCES = connection_watchdog.c +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac ETAGS = etags CTAGS = ctags am__tty_colors = \ @@ -147,6 +161,10 @@ EXEEXT = @EXEEXT@ EXT_LIBS = @EXT_LIBS@ EXT_LIB_PATH = @EXT_LIB_PATH@ FGREP = @FGREP@ +GLIB_CFLAGS = @GLIB_CFLAGS@ +GLIB_GENMARSHAL = @GLIB_GENMARSHAL@ +GLIB_LIBS = @GLIB_LIBS@ +GLIB_MKENUMS = @GLIB_MKENUMS@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GNUNETDNS_GROUP = @GNUNETDNS_GROUP@ @@ -157,6 +175,7 @@ GN_LIBINTL = @GN_LIBINTL@ GN_LIB_LDFLAGS = @GN_LIB_LDFLAGS@ GN_PLUGIN_LDFLAGS = @GN_PLUGIN_LDFLAGS@ GN_USER_HOME_DIR = @GN_USER_HOME_DIR@ +GOBJECT_QUERY = @GOBJECT_QUERY@ GREP = @GREP@ HAVE_LIBUNISTRING = @HAVE_LIBUNISTRING@ INCLTDL = @INCLTDL@ @@ -179,6 +198,8 @@ LIBCURL_CPPFLAGS = @LIBCURL_CPPFLAGS@ LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@ LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@ LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@ +LIBGTOP_CFLAGS = @LIBGTOP_CFLAGS@ +LIBGTOP_LIBS = @LIBGTOP_LIBS@ LIBICONV = @LIBICONV@ LIBINTL = @LIBINTL@ LIBLTDL = @LIBLTDL@ @@ -200,6 +221,7 @@ LT_CONFIG_H = @LT_CONFIG_H@ LT_DLLOADERS = @LT_DLLOADERS@ LT_DLPREOPEN = @LT_DLPREOPEN@ MAKEINFO = @MAKEINFO@ +MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MONKEYPREFIX = @MONKEYPREFIX@ MSGFMT = @MSGFMT@ @@ -209,6 +231,7 @@ MYSQL_CPPFLAGS = @MYSQL_CPPFLAGS@ MYSQL_LDFLAGS = @MYSQL_LDFLAGS@ NM = @NM@ NMEDIT = @NMEDIT@ +NSS_DIR = @NSS_DIR@ OBJC = @OBJC@ OBJCDEPMODE = @OBJCDEPMODE@ OBJCFLAGS = @OBJCFLAGS@ @@ -224,6 +247,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_URL = @PACKAGE_URL@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ +PKG_CONFIG = @PKG_CONFIG@ POSTGRES_CPPFLAGS = @POSTGRES_CPPFLAGS@ POSTGRES_LDFLAGS = @POSTGRES_LDFLAGS@ POSUB = @POSUB@ @@ -255,6 +279,7 @@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ abs_top_srcdir = @abs_top_srcdir@ +ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_CXX = @ac_ct_CXX@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ @@ -277,6 +302,7 @@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ exec_prefix = @exec_prefix@ +gitcommand = @gitcommand@ host = @host@ host_alias = @host_alias@ host_cpu = @host_cpu@ @@ -290,7 +316,6 @@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ ltdl_LIBOBJS = @ltdl_LIBOBJS@ ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@ mandir = @mandir@ @@ -308,6 +333,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ subdirs = @subdirs@ +svnversioncommand = @svnversioncommand@ sys_symbol_underscore = @sys_symbol_underscore@ sysconfdir = @sysconfdir@ target = @target@ @@ -329,17 +355,18 @@ noinst_SCRIPTS = \ test_integration_connection_values_tcp_udp.py \ test_integration_connection_values_tcp_udp_http.py -@HAVE_PYTHON_PEXPECT_TRUE@check_SCRIPTS = \ -@HAVE_PYTHON_PEXPECT_TRUE@ test_integration_bootstrap_and_connect.py \ -@HAVE_PYTHON_PEXPECT_TRUE@ test_integration_bootstrap_and_connect_and_disconnect.py \ -@HAVE_PYTHON_PEXPECT_TRUE@ test_integration_bootstrap_and_connect_and_disconnect_nat.py \ -@HAVE_PYTHON_PEXPECT_TRUE@ test_integration_restart.py \ -@HAVE_PYTHON_PEXPECT_TRUE@ test_integration_clique.py \ -@HAVE_PYTHON_PEXPECT_TRUE@ test_integration_clique_nat.py \ -@HAVE_PYTHON_PEXPECT_TRUE@ test_integration_connect_on_restart.py +@HAVE_PYTHON_TRUE@check_SCRIPTS = \ +@HAVE_PYTHON_TRUE@ test_integration_bootstrap_and_connect.py \ +@HAVE_PYTHON_TRUE@ test_integration_bootstrap_and_connect_and_disconnect.py \ +@HAVE_PYTHON_TRUE@ test_integration_bootstrap_and_connect_and_disconnect_nat.py \ +@HAVE_PYTHON_TRUE@ test_integration_restart.py \ +@HAVE_PYTHON_TRUE@ test_integration_clique.py \ +@HAVE_PYTHON_TRUE@ test_integration_clique_nat.py \ +@HAVE_PYTHON_TRUE@ test_integration_connect_on_restart.py -@ENABLE_TEST_RUN_TRUE@TESTS = \ -@ENABLE_TEST_RUN_TRUE@ $(check_SCRIPTS) +# test_integration_disconnect.py +@ENABLE_TEST_RUN_TRUE@@HAVE_MHD_TRUE@TESTS = \ +@ENABLE_TEST_RUN_TRUE@@HAVE_MHD_TRUE@ $(check_SCRIPTS) connection_watchdog_SOURCE = \ connection_watchdog.c @@ -351,13 +378,6 @@ connection_watchdog_LDADD = \ $(top_builddir)/src/util/libgnunetutil.la do_subst = $(SED) -e 's,[@]PYTHON[@],$(PYTHON),g' -test_connection_stability_SOURCES = \ - test_connection_stability.c - -test_connection_stability_LDADD = \ - $(top_builddir)/src/testing/libgnunettesting.la \ - $(top_builddir)/src/util/libgnunetutil.la - EXTRA_DIST = \ gnunet_testing.py.in \ gnunet_pyexpect.py.in \ @@ -373,6 +393,7 @@ EXTRA_DIST = \ test_integration_clique.py.in \ test_integration_clique_nat.py.in \ confs/c_bootstrap_server.conf \ + confs/c_bootstrap_server_w_massif.conf \ confs/c_nat_client.conf \ confs/c_no_nat_client_2.conf \ confs/c_no_nat_client.conf \ @@ -385,7 +406,6 @@ EXTRA_DIST = \ confs/c_no_nat_client_http_2.conf \ confs/c_no_nat_client_unix.conf \ confs/c_no_nat_client_unix_2.conf \ - test_connection_stability.conf \ hostkeys/0000-hostkey \ hostkeys/0001-hostkey \ hostkeys/0002-hostkey \ @@ -437,15 +457,6 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - clean-noinstPROGRAMS: @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ @@ -454,12 +465,9 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -connection_watchdog$(EXEEXT): $(connection_watchdog_OBJECTS) $(connection_watchdog_DEPENDENCIES) +connection_watchdog$(EXEEXT): $(connection_watchdog_OBJECTS) $(connection_watchdog_DEPENDENCIES) $(EXTRA_connection_watchdog_DEPENDENCIES) @rm -f connection_watchdog$(EXEEXT) $(AM_V_CCLD)$(LINK) $(connection_watchdog_OBJECTS) $(connection_watchdog_LDADD) $(LIBS) -test_connection_stability$(EXEEXT): $(test_connection_stability_OBJECTS) $(test_connection_stability_DEPENDENCIES) - @rm -f test_connection_stability$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(test_connection_stability_OBJECTS) $(test_connection_stability_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -468,31 +476,27 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/connection_watchdog.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_connection_stability.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -633,14 +637,15 @@ check-TESTS: $(TESTS) fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -675,7 +680,7 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_SCRIPTS) + $(MAKE) $(AM_MAKEFLAGS) $(check_SCRIPTS) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile $(PROGRAMS) $(SCRIPTS) @@ -690,10 +695,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -708,8 +718,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstPROGRAMS mostlyclean-am +clean-am: clean-generic clean-libtool clean-noinstPROGRAMS \ + mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -780,15 +790,15 @@ uninstall-am: .MAKE: check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool \ - clean-noinstPROGRAMS ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + clean-generic clean-libtool clean-noinstPROGRAMS ctags \ + distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am diff --git a/src/integration-tests/confs/c_bootstrap_server.conf b/src/integration-tests/confs/c_bootstrap_server.conf index 7235fca..4ead99d 100644 --- a/src/integration-tests/confs/c_bootstrap_server.conf +++ b/src/integration-tests/confs/c_bootstrap_server.conf @@ -1,6 +1,5 @@ [PATHS] SERVICEHOME = /tmp/c_bootstrap_server/ -DEFAULTCONFIG = confs/c_bootstrap_server.conf [gnunetd] #HOSTKEY = $SERVICEHOME/.hostkey @@ -11,7 +10,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -22,7 +20,6 @@ AUTOSTART = YES PORT = 20017 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-resolver ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -35,7 +32,6 @@ AUTOSTART = YES PORT = 20016 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-mesh ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -48,7 +44,6 @@ AUTOSTART = YES PORT = 20015 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-nse ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -59,7 +54,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof HISTOGRAM = $SERVICEHOME/nse-history.log WORKDELAY = 5 ms INTERVAL = 1 h -WORKBITS = 26 +WORKBITS = 1 [topology] MINIMUM-FRIENDS = 0 @@ -67,7 +62,6 @@ FRIENDS-ONLY = NO AUTOCONNECT = YES TARGET-CONNECTION-COUNT = 16 FRIENDS = $SERVICEHOME/friends -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-topology [datastore] @@ -78,7 +72,6 @@ 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; @@ -101,7 +94,6 @@ AUTOSTART = YES PORT = 20013 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-peerinfo ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -125,15 +117,14 @@ 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 +WAN_QUOTA_IN = unlimited +WAN_QUOTA_OUT = unlimited DUMP_MLP = NO DUMP_SOLUTION = NO DUMP_OVERWRITE = NO @@ -147,7 +138,6 @@ AUTOSTART = YES PORT = 20011 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-transport NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; @@ -199,7 +189,6 @@ AUTOSTART = NO PORT = 20006 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-template ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -217,7 +206,6 @@ 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; @@ -232,7 +220,6 @@ MIN_MIGRATION_DELAY = 100 ms EXPECTED_NEIGHBOUR_COUNT = 128 [vpn] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-vpn IPV6ADDR = 1234::1 IPV6PREFIX = 32 @@ -243,7 +230,6 @@ VIRTDNS6 = 1234::17 IFNAME = vpn-gnunet [exit] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-exit IPV6ADDR = 1234:1::1 IPV6PREFIX = 32 @@ -258,7 +244,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -269,7 +254,6 @@ PROVIDE_EXIT = NO PORT = 20004 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-arm ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -282,7 +266,6 @@ UNIX_MATCH_GID = YES HTTPPORT = 8080 HOME = $SERVICEHOME HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-hostlist OPTIONS = -p #SERVERS = http://v9.gnunet.org:58080/ @@ -293,7 +276,6 @@ AUTOSTART = YES PORT = 20003 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-core ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -327,7 +309,6 @@ AUTOSTART = YES PORT = 20001 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-statistics ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -340,7 +321,6 @@ AUTOSTART = YES PORT = 20000 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dht ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -349,6 +329,16 @@ UNIXPATH = /tmp/test-service-dht-1 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES +[chat] +UNIXPATH = /tmp/test-service-chat-b_server-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + +[dv] +UNIXPATH = /tmp/test-service-dv-b_server-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + [dhtcache] DATABASE = sqlite QUOTA = 1 MB @@ -360,4 +350,8 @@ AUTOSTART = NO AUTOSTART = NO [lockmanager] -AUTOSTART = NO
\ No newline at end of file +AUTOSTART = NO +[consensus] +AUTOSTART = NO + + diff --git a/src/integration-tests/confs/c_bootstrap_server_w_massif.conf b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf new file mode 100644 index 0000000..b6c88c4 --- /dev/null +++ b/src/integration-tests/confs/c_bootstrap_server_w_massif.conf @@ -0,0 +1,348 @@ +[PATHS] +SERVICEHOME = /tmp/c_bootstrap_server/ + +[gnunetd] +#HOSTKEY = $SERVICEHOME/.hostkey +HOSTKEY = hostkeys/0000-hostkey + +[vpn] +AUTOSTART = YES +PORT = 0 +HOSTNAME = localhost +HOME = $SERVICEHOME +BINARY = gnunet-service-dns +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +UNIXPATH = /tmp/gnunet-service-vpn-15 + +[resolver] +AUTOSTART = YES +PORT = 20017 +HOSTNAME = localhost +HOME = $SERVICEHOME +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 +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 +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 = 1 + +[topology] +MINIMUM-FRIENDS = 0 +FRIENDS-ONLY = NO +AUTOCONNECT = YES +TARGET-CONNECTION-COUNT = 16 +FRIENDS = $SERVICEHOME/friends +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 +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 +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 +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 = unlimited +WAN_QUOTA_OUT = unlimited +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] +#PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_bootstrap.out --tool=massif +AUTOSTART = YES +PORT = 20011 +HOSTNAME = localhost +HOME = $SERVICEHOME +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 +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 +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] +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] +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 +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 +BINARY = gnunet-service-arm +ACCEPT_FROM = 127.0.0.1; +ACCEPT_FROM6 = ::1; +DEFAULTSERVICES = topology hostlist fs dht gns +UNIXPATH = /tmp/test-service-arm-4 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + +[hostlist] +HTTPPORT = 8080 +HOME = $SERVICEHOME +HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data +BINARY = gnunet-daemon-hostlist +OPTIONS = -p +#SERVERS = http://v9.gnunet.org:58080/ +HTTP-PROXY = + +[core] +AUTOSTART = YES +PORT = 20003 +HOSTNAME = localhost +HOME = $SERVICEHOME +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 +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 +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 + +[gns] +AUTOSTART = NO + +[namestore] +AUTOSTART = NO + +[lockmanager] +AUTOSTART = NO +[consensus] +AUTOSTART = NO + + diff --git a/src/integration-tests/confs/c_nat_client.conf b/src/integration-tests/confs/c_nat_client.conf index 4f6c578..130d439 100644 --- a/src/integration-tests/confs/c_nat_client.conf +++ b/src/integration-tests/confs/c_nat_client.conf @@ -1,6 +1,5 @@ [PATHS] SERVICEHOME = /tmp/c_nat_client -DEFAULTCONFIG = confs/c_nat_client.conf [gnunetd] HOSTKEY = hostkeys/0002-hostkey @@ -19,7 +18,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -31,7 +29,6 @@ AUTOSTART = YES PORT = 20071 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-resolver ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -44,7 +41,6 @@ AUTOSTART = YES PORT = 20070 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-mesh ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -57,7 +53,6 @@ AUTOSTART = YES PORT = 20069 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-nse ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -68,7 +63,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof HISTOGRAM = $SERVICEHOME/nse-history.log WORKDELAY = 5 ms INTERVAL = 1 h -WORKBITS = 26 +WORKBITS = 1 [topology] MINIMUM-FRIENDS = 0 @@ -76,7 +71,6 @@ FRIENDS-ONLY = NO AUTOCONNECT = YES TARGET-CONNECTION-COUNT = 16 FRIENDS = $SERVICEHOME/friends -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-topology [datastore] @@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES PORT = 20068 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-datastore ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -110,7 +103,6 @@ AUTOSTART = YES PORT = 20067 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-peerinfo ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -131,15 +123,14 @@ AUTOSTART = YES PORT = 20066 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-ats ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; UNIXPATH = /tmp/test-service-ats-51 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES -WAN_QUOTA_IN = 65536 -WAN_QUOTA_OUT = 65536 +WAN_QUOTA_IN = unlimited +WAN_QUOTA_OUT = unlimited DUMP_MLP = NO DUMP_SOLUTION = NO DUMP_OVERWRITE = NO @@ -153,7 +144,6 @@ AUTOSTART = YES PORT = 20065 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-transport NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; @@ -205,7 +195,6 @@ AUTOSTART = NO PORT = 20060 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-template ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ PORT = 20059 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-fs ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms EXPECTED_NEIGHBOUR_COUNT = 128 [vpn] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-vpn IPV6ADDR = 1234::1 IPV6PREFIX = 32 @@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17 IFNAME = vpn-gnunet [exit] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-exit IPV6ADDR = 1234:1::1 IPV6PREFIX = 32 @@ -264,7 +250,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -275,7 +260,6 @@ PROVIDE_EXIT = NO PORT = 20058 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-arm ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES HTTPPORT = 8080 HOME = $SERVICEHOME HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-hostlist OPTIONS = -b SERVERS = http://localhost:8080/ @@ -299,7 +282,6 @@ AUTOSTART = YES PORT = 20057 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-core ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -333,7 +315,6 @@ AUTOSTART = YES PORT = 20055 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-statistics ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -346,7 +327,6 @@ AUTOSTART = YES PORT = 20054 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dht ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -359,5 +339,19 @@ UNIX_MATCH_GID = YES DATABASE = sqlite QUOTA = 1 MB +[chat] +UNIXPATH = /tmp/test-service-chat-b_nat_c-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + +[dv] +UNIXPATH = /tmp/test-service-dv-b_nat_c-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + [lockmanager] -AUTOSTART = NO
\ No newline at end of file +AUTOSTART = NO +[consensus] +AUTOSTART = NO + + diff --git a/src/integration-tests/confs/c_no_nat_client.conf b/src/integration-tests/confs/c_no_nat_client.conf index 0a24b5a..494e813 100644 --- a/src/integration-tests/confs/c_no_nat_client.conf +++ b/src/integration-tests/confs/c_no_nat_client.conf @@ -1,6 +1,5 @@ [PATHS] SERVICEHOME = /tmp/c_no_nat_client/ -DEFAULTCONFIG = confs/c_no_nat_client.conf [gnunetd] #HOSTKEY = $SERVICEHOME/.hostkey @@ -17,7 +16,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -28,7 +26,6 @@ AUTOSTART = YES PORT = 20035 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-resolver ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -41,7 +38,6 @@ AUTOSTART = YES PORT = 20034 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-mesh ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -54,7 +50,6 @@ AUTOSTART = YES PORT = 20033 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-nse ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -65,7 +60,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof HISTOGRAM = $SERVICEHOME/nse-history.log WORKDELAY = 5 ms INTERVAL = 1 h -WORKBITS = 26 +WORKBITS = 1 [topology] MINIMUM-FRIENDS = 0 @@ -73,7 +68,6 @@ FRIENDS-ONLY = NO AUTOCONNECT = YES TARGET-CONNECTION-COUNT = 16 FRIENDS = $SERVICEHOME/friends -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-topology [datastore] @@ -84,7 +78,6 @@ 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; @@ -107,7 +100,6 @@ AUTOSTART = YES PORT = 20031 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-peerinfo ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -131,15 +123,14 @@ 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 +WAN_QUOTA_IN = unlimited +WAN_QUOTA_OUT = unlimited DUMP_MLP = NO DUMP_SOLUTION = NO DUMP_OVERWRITE = NO @@ -149,12 +140,11 @@ ATS_MIN_INTERVAL = 15000 ATS_EXEC_INTERVAL = 30000 [transport] -#DEBUG = YES +#PREFIX = valgrind --alloc-fn=GNUNET_xmalloc_ --alloc-fn=GNUNET_xmalloc_unchecked_ --alloc-fn=GNUNET_xrealloc_ --alloc-fn=GNUNET_xgrow_ --massif-out-file=massif_client.out --tool=massif AUTOSTART = YES PORT = 20029 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-transport NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; @@ -206,7 +196,6 @@ AUTOSTART = NO PORT = 20024 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-template ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -224,7 +213,6 @@ 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; @@ -239,7 +227,6 @@ MIN_MIGRATION_DELAY = 100 ms EXPECTED_NEIGHBOUR_COUNT = 128 [vpn] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-vpn IPV6ADDR = 1234::1 IPV6PREFIX = 32 @@ -250,7 +237,6 @@ VIRTDNS6 = 1234::17 IFNAME = vpn-gnunet [exit] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-exit IPV6ADDR = 1234:1::1 IPV6PREFIX = 32 @@ -265,7 +251,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -276,7 +261,6 @@ PROVIDE_EXIT = NO PORT = 20022 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-arm ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -289,7 +273,6 @@ UNIX_MATCH_GID = YES HTTPPORT = 8080 HOME = $SERVICEHOME HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-hostlist OPTIONS = -b SERVERS = http://localhost:8080/ @@ -300,7 +283,6 @@ AUTOSTART = YES PORT = 20021 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-core ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -334,7 +316,6 @@ AUTOSTART = YES PORT = 20019 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-statistics ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -347,7 +328,6 @@ AUTOSTART = YES PORT = 20018 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dht ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -360,5 +340,19 @@ UNIX_MATCH_GID = YES DATABASE = sqlite QUOTA = 1 MB +[chat] +UNIXPATH = /tmp/test-service-chat-b_no_nat_c-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + +[dv] +UNIXPATH = /tmp/test-service-dv-b_no_nat_c-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + [lockmanager] AUTOSTART = NO +[consensus] +AUTOSTART = NO + + 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 61a6a3b..8cdd24f 100644 --- a/src/integration-tests/confs/c_no_nat_client_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_2.conf @@ -1,6 +1,5 @@ [PATHS] SERVICEHOME = /tmp/c_no_nat_client_2/ -DEFAULTCONFIG = confs/c_no_nat_client_2.conf [gnunetd] #HOSTKEY = $SERVICEHOME/.hostkey @@ -11,7 +10,6 @@ AUTOSTART = YES PORT = 20053 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-resolver ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -24,7 +22,6 @@ AUTOSTART = YES PORT = 20052 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-mesh ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -37,7 +34,6 @@ AUTOSTART = YES PORT = 20051 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-nse ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -48,7 +44,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof HISTOGRAM = $SERVICEHOME/nse-history.log WORKDELAY = 5 ms INTERVAL = 1 h -WORKBITS = 26 +WORKBITS = 1 [topology] MINIMUM-FRIENDS = 0 @@ -56,7 +52,6 @@ FRIENDS-ONLY = NO AUTOCONNECT = YES TARGET-CONNECTION-COUNT = 16 FRIENDS = $SERVICEHOME/friends -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-topology [datastore] @@ -67,7 +62,6 @@ UNIX_MATCH_GID = YES PORT = 20050 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-datastore ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -90,7 +84,6 @@ AUTOSTART = YES PORT = 20049 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-peerinfo ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -114,15 +107,14 @@ AUTOSTART = YES PORT = 20048 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-ats ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; UNIXPATH = /tmp/test-service-ats-37 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES -WAN_QUOTA_IN = 65536 -WAN_QUOTA_OUT = 65536 +WAN_QUOTA_IN = unlimited +WAN_QUOTA_OUT = unlimited DUMP_MLP = NO DUMP_SOLUTION = NO DUMP_OVERWRITE = NO @@ -136,7 +128,6 @@ AUTOSTART = YES PORT = 20047 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-transport NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; @@ -188,7 +179,6 @@ AUTOSTART = NO PORT = 20042 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-template ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -206,7 +196,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ PORT = 20041 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-fs ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -221,7 +210,6 @@ MIN_MIGRATION_DELAY = 100 ms EXPECTED_NEIGHBOUR_COUNT = 128 [vpn] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-vpn IPV6ADDR = 1234::1 IPV6PREFIX = 32 @@ -232,7 +220,6 @@ VIRTDNS6 = 1234::17 IFNAME = vpn-gnunet [exit] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-exit IPV6ADDR = 1234:1::1 IPV6PREFIX = 32 @@ -247,7 +234,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -258,7 +244,6 @@ PROVIDE_EXIT = NO PORT = 20040 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-arm ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -271,7 +256,6 @@ UNIX_MATCH_GID = YES HTTPPORT = 8080 HOME = $SERVICEHOME HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-hostlist OPTIONS = -b SERVERS = http://localhost:8080/ @@ -282,7 +266,6 @@ AUTOSTART = YES PORT = 20039 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-core ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -316,7 +299,6 @@ AUTOSTART = YES PORT = 20037 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-statistics ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -329,7 +311,6 @@ AUTOSTART = YES PORT = 20036 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dht ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -342,6 +323,16 @@ UNIX_MATCH_GID = YES DATABASE = sqlite QUOTA = 1 MB +[chat] +UNIXPATH = /tmp/test-service-chat-b_no_nat_c-2 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + +[dv] +UNIXPATH = /tmp/test-service-dv-b_no_nat_c-2 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + [gns] AUTOSTART = NO @@ -349,3 +340,7 @@ AUTOSTART = NO AUTOSTART = NO +[consensus] +AUTOSTART = NO + + diff --git a/src/integration-tests/confs/c_no_nat_client_http.conf b/src/integration-tests/confs/c_no_nat_client_http.conf index 718794e..c0c4aa8 100644 --- a/src/integration-tests/confs/c_no_nat_client_http.conf +++ b/src/integration-tests/confs/c_no_nat_client_http.conf @@ -1,6 +1,5 @@ [PATHS] SERVICEHOME = /tmp/c_no_nat_client/ -DEFAULTCONFIG = confs/c_no_nat_client_http.conf [gnunetd] #HOSTKEY = $SERVICEHOME/.hostkey @@ -17,7 +16,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -28,7 +26,6 @@ AUTOSTART = YES PORT = 20035 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-resolver ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -41,7 +38,6 @@ AUTOSTART = YES PORT = 20034 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-mesh ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -54,7 +50,6 @@ AUTOSTART = YES PORT = 20033 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-nse ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -65,7 +60,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof HISTOGRAM = $SERVICEHOME/nse-history.log WORKDELAY = 5 ms INTERVAL = 1 h -WORKBITS = 26 +WORKBITS = 1 [topology] MINIMUM-FRIENDS = 0 @@ -73,7 +68,6 @@ FRIENDS-ONLY = NO AUTOCONNECT = YES TARGET-CONNECTION-COUNT = 16 FRIENDS = $SERVICEHOME/friends -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-topology [datastore] @@ -84,7 +78,6 @@ 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; @@ -107,7 +100,6 @@ AUTOSTART = YES PORT = 20031 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-peerinfo ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -131,15 +123,14 @@ 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 +WAN_QUOTA_IN = unlimited +WAN_QUOTA_OUT = unlimited DUMP_MLP = NO DUMP_SOLUTION = NO DUMP_OVERWRITE = NO @@ -150,12 +141,10 @@ ATS_EXEC_INTERVAL = 30000 [transport] PREFIX = valgrind --leak-check=full -#DEBUG = YES AUTOSTART = YES PORT = 20029 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-transport NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; @@ -207,7 +196,6 @@ AUTOSTART = NO PORT = 20024 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-template ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -225,7 +213,6 @@ 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; @@ -240,7 +227,6 @@ MIN_MIGRATION_DELAY = 100 ms EXPECTED_NEIGHBOUR_COUNT = 128 [vpn] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-vpn IPV6ADDR = 1234::1 IPV6PREFIX = 32 @@ -251,7 +237,6 @@ VIRTDNS6 = 1234::17 IFNAME = vpn-gnunet [exit] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-exit IPV6ADDR = 1234:1::1 IPV6PREFIX = 32 @@ -266,7 +251,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -277,7 +261,6 @@ PROVIDE_EXIT = NO PORT = 20022 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-arm ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -290,7 +273,6 @@ UNIX_MATCH_GID = YES HTTPPORT = 8080 HOME = $SERVICEHOME HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-hostlist OPTIONS = -b SERVERS = http://localhost:8080/ @@ -301,7 +283,6 @@ AUTOSTART = YES PORT = 20021 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-core ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -335,7 +316,6 @@ AUTOSTART = YES PORT = 20019 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-statistics ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -348,7 +328,6 @@ AUTOSTART = YES PORT = 20018 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dht ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -357,7 +336,21 @@ UNIXPATH = /tmp/test-service-dht-15 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES +[chat] +UNIXPATH = /tmp/test-service-chat-b_no_nat_http_c-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + +[dv] +UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + [dhtcache] DATABASE = sqlite QUOTA = 1 MB +[consensus] +AUTOSTART = NO + + diff --git a/src/integration-tests/confs/c_no_nat_client_http_2.conf b/src/integration-tests/confs/c_no_nat_client_http_2.conf index 3acb6b1..935b0b3 100644 --- a/src/integration-tests/confs/c_no_nat_client_http_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_http_2.conf @@ -1,6 +1,5 @@ [PATHS] SERVICEHOME = /tmp/c_no_nat_client_2/ -DEFAULTCONFIG = confs/c_no_nat_client_http_2.conf [gnunetd] #HOSTKEY = $SERVICEHOME/.hostkey @@ -17,7 +16,6 @@ AUTOSTART = YES PORT = 20053 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-resolver ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -30,7 +28,6 @@ AUTOSTART = YES PORT = 20052 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-mesh ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -43,7 +40,6 @@ AUTOSTART = YES PORT = 20051 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-nse ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -54,7 +50,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof HISTOGRAM = $SERVICEHOME/nse-history.log WORKDELAY = 5 ms INTERVAL = 1 h -WORKBITS = 26 +WORKBITS = 1 [topology] MINIMUM-FRIENDS = 0 @@ -62,7 +58,6 @@ FRIENDS-ONLY = NO AUTOCONNECT = YES TARGET-CONNECTION-COUNT = 16 FRIENDS = $SERVICEHOME/friends -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-topology [datastore] @@ -73,7 +68,6 @@ UNIX_MATCH_GID = YES PORT = 20050 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-datastore ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -96,7 +90,6 @@ AUTOSTART = YES PORT = 20049 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-peerinfo ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -120,15 +113,14 @@ AUTOSTART = YES PORT = 20048 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-ats ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; UNIXPATH = /tmp/test-service-ats-37 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES -WAN_QUOTA_IN = 65536 -WAN_QUOTA_OUT = 65536 +WAN_QUOTA_IN = unlimited +WAN_QUOTA_OUT = unlimited DUMP_MLP = NO DUMP_SOLUTION = NO DUMP_OVERWRITE = NO @@ -144,7 +136,6 @@ AUTOSTART = YES PORT = 20047 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-transport NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; @@ -196,7 +187,6 @@ AUTOSTART = NO PORT = 20042 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-template ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -214,7 +204,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ PORT = 20041 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-fs ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -229,7 +218,6 @@ MIN_MIGRATION_DELAY = 100 ms EXPECTED_NEIGHBOUR_COUNT = 128 [vpn] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-vpn IPV6ADDR = 1234::1 IPV6PREFIX = 32 @@ -240,7 +228,6 @@ VIRTDNS6 = 1234::17 IFNAME = vpn-gnunet [exit] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-exit IPV6ADDR = 1234:1::1 IPV6PREFIX = 32 @@ -255,7 +242,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -266,7 +252,6 @@ PROVIDE_EXIT = NO PORT = 20040 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-arm ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -279,7 +264,6 @@ UNIX_MATCH_GID = YES HTTPPORT = 8080 HOME = $SERVICEHOME HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-hostlist OPTIONS = -b SERVERS = http://localhost:8080/ @@ -290,7 +274,6 @@ AUTOSTART = YES PORT = 20039 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-core ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -324,7 +307,6 @@ AUTOSTART = YES PORT = 20037 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-statistics ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -337,7 +319,6 @@ AUTOSTART = YES PORT = 20036 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dht ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -350,3 +331,17 @@ UNIX_MATCH_GID = YES DATABASE = sqlite QUOTA = 1 MB +[chat] +UNIXPATH = /tmp/test-service-chat-b_no_nat_http_c-2 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + +[dv] +UNIXPATH = /tmp/test-service-dv-b_no_nat_http_c-2 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + +[consensus] +AUTOSTART = NO + + diff --git a/src/integration-tests/confs/c_no_nat_client_unix.conf b/src/integration-tests/confs/c_no_nat_client_unix.conf index 37c5ad6..56f55dd 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix.conf @@ -1,6 +1,5 @@ [PATHS] SERVICEHOME = /tmp/c_no_nat_client/ -DEFAULTCONFIG = confs/c_no_nat_client_unix.conf [gnunetd] #HOSTKEY = $SERVICEHOME/.hostkey @@ -17,7 +16,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -28,7 +26,6 @@ AUTOSTART = YES PORT = 20035 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-resolver ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -41,7 +38,6 @@ AUTOSTART = YES PORT = 20034 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-mesh ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -54,7 +50,6 @@ AUTOSTART = YES PORT = 20033 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-nse ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -65,7 +60,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof HISTOGRAM = $SERVICEHOME/nse-history.log WORKDELAY = 5 ms INTERVAL = 1 h -WORKBITS = 26 +WORKBITS = 1 [topology] MINIMUM-FRIENDS = 0 @@ -73,7 +68,6 @@ FRIENDS-ONLY = NO AUTOCONNECT = YES TARGET-CONNECTION-COUNT = 16 FRIENDS = $SERVICEHOME/friends -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-topology [datastore] @@ -84,7 +78,6 @@ 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; @@ -107,7 +100,6 @@ AUTOSTART = YES PORT = 20031 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-peerinfo ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -131,15 +123,14 @@ 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 +WAN_QUOTA_IN = unlimited +WAN_QUOTA_OUT = unlimited DUMP_MLP = NO DUMP_SOLUTION = NO DUMP_OVERWRITE = NO @@ -150,12 +141,10 @@ ATS_EXEC_INTERVAL = 30000 [transport] PREFIX = valgrind --leak-check=full -#DEBUG = YES AUTOSTART = YES PORT = 20029 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-transport NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; @@ -210,7 +199,6 @@ AUTOSTART = NO PORT = 20024 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-template ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -228,7 +216,6 @@ 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; @@ -243,7 +230,6 @@ MIN_MIGRATION_DELAY = 100 ms EXPECTED_NEIGHBOUR_COUNT = 128 [vpn] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-vpn IPV6ADDR = 1234::1 IPV6PREFIX = 32 @@ -254,7 +240,6 @@ VIRTDNS6 = 1234::17 IFNAME = vpn-gnunet [exit] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-exit IPV6ADDR = 1234:1::1 IPV6PREFIX = 32 @@ -269,7 +254,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -280,7 +264,6 @@ PROVIDE_EXIT = NO PORT = 20022 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-arm ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -293,7 +276,6 @@ UNIX_MATCH_GID = YES HTTPPORT = 8080 HOME = $SERVICEHOME HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-hostlist OPTIONS = -b SERVERS = http://localhost:8080/ @@ -304,7 +286,6 @@ AUTOSTART = YES PORT = 20021 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-core ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -338,7 +319,6 @@ AUTOSTART = YES PORT = 20019 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-statistics ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -351,7 +331,6 @@ AUTOSTART = YES PORT = 20018 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dht ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -360,7 +339,21 @@ UNIXPATH = /tmp/test-service-dht-15 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES +[chat] +UNIXPATH = /tmp/test-service-chat-b_no_nat_unix_c-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + +[dv] +UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + [dhtcache] DATABASE = sqlite QUOTA = 1 MB +[consensus] +AUTOSTART = NO + + diff --git a/src/integration-tests/confs/c_no_nat_client_unix_2.conf b/src/integration-tests/confs/c_no_nat_client_unix_2.conf index 6bf8e8b..463bebb 100644 --- a/src/integration-tests/confs/c_no_nat_client_unix_2.conf +++ b/src/integration-tests/confs/c_no_nat_client_unix_2.conf @@ -1,6 +1,5 @@ [PATHS] SERVICEHOME = /tmp/c_no_nat_client_2/ -DEFAULTCONFIG = confs/c_no_nat_client_unix_2.conf [gnunetd] #HOSTKEY = $SERVICEHOME/.hostkey @@ -17,7 +16,6 @@ AUTOSTART = YES PORT = 20053 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-resolver ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -30,7 +28,6 @@ AUTOSTART = YES PORT = 20052 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-mesh ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -43,7 +40,6 @@ AUTOSTART = YES PORT = 20051 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-nse ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -54,7 +50,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof HISTOGRAM = $SERVICEHOME/nse-history.log WORKDELAY = 5 ms INTERVAL = 1 h -WORKBITS = 26 +WORKBITS = 1 [topology] MINIMUM-FRIENDS = 0 @@ -62,7 +58,6 @@ FRIENDS-ONLY = NO AUTOCONNECT = YES TARGET-CONNECTION-COUNT = 16 FRIENDS = $SERVICEHOME/friends -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-topology [datastore] @@ -73,7 +68,6 @@ UNIX_MATCH_GID = YES PORT = 20050 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-datastore ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -96,7 +90,6 @@ AUTOSTART = YES PORT = 20049 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-peerinfo ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -120,15 +113,14 @@ AUTOSTART = YES PORT = 20048 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-ats ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; UNIXPATH = /tmp/test-service-ats-37 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES -WAN_QUOTA_IN = 65536 -WAN_QUOTA_OUT = 65536 +WAN_QUOTA_IN = unlimited +WAN_QUOTA_OUT = unlimited DUMP_MLP = NO DUMP_SOLUTION = NO DUMP_OVERWRITE = NO @@ -144,7 +136,6 @@ AUTOSTART = YES PORT = 20047 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-transport NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; @@ -199,7 +190,6 @@ AUTOSTART = NO PORT = 20042 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-template ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -217,7 +207,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ PORT = 20041 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-fs ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -232,7 +221,6 @@ MIN_MIGRATION_DELAY = 100 ms EXPECTED_NEIGHBOUR_COUNT = 128 [vpn] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-vpn IPV6ADDR = 1234::1 IPV6PREFIX = 32 @@ -243,7 +231,6 @@ VIRTDNS6 = 1234::17 IFNAME = vpn-gnunet [exit] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-exit IPV6ADDR = 1234:1::1 IPV6PREFIX = 32 @@ -258,7 +245,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -269,7 +255,6 @@ PROVIDE_EXIT = NO PORT = 20040 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-arm ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -282,7 +267,6 @@ UNIX_MATCH_GID = YES HTTPPORT = 8080 HOME = $SERVICEHOME HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-hostlist OPTIONS = -b SERVERS = http://localhost:8080/ @@ -293,7 +277,6 @@ AUTOSTART = YES PORT = 20039 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-core ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -327,7 +310,6 @@ AUTOSTART = YES PORT = 20037 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-statistics ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -340,7 +322,6 @@ AUTOSTART = YES PORT = 20036 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dht ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -349,7 +330,21 @@ UNIXPATH = /tmp/test-service-dht-29 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES +[chat] +UNIXPATH = /tmp/test-service-chat-b_no_nat_unix_c-2 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + +[dv] +UNIXPATH = /tmp/test-service-dv-b_no_nat_unix_c-2 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + [dhtcache] DATABASE = sqlite QUOTA = 1 MB +[consensus] +AUTOSTART = NO + + diff --git a/src/integration-tests/confs/c_normal_client_tcp.conf b/src/integration-tests/confs/c_normal_client_tcp.conf index 45acdaf..ec8098c 100644 --- a/src/integration-tests/confs/c_normal_client_tcp.conf +++ b/src/integration-tests/confs/c_normal_client_tcp.conf @@ -1,6 +1,5 @@ [PATHS] SERVICEHOME = /tmp/c_normal_client -DEFAULTCONFIG = confs/c_normal_client_tcp.conf [gnunetd] HOSTKEY = hostkeys/0002-hostkey @@ -19,7 +18,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -31,7 +29,6 @@ AUTOSTART = YES PORT = 20071 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-resolver ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -44,7 +41,6 @@ AUTOSTART = YES PORT = 20070 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-mesh ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -57,7 +53,6 @@ AUTOSTART = YES PORT = 20069 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-nse ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -68,7 +63,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof HISTOGRAM = $SERVICEHOME/nse-history.log WORKDELAY = 5 ms INTERVAL = 1 h -WORKBITS = 26 +WORKBITS = 1 [topology] MINIMUM-FRIENDS = 0 @@ -76,7 +71,6 @@ FRIENDS-ONLY = NO AUTOCONNECT = YES TARGET-CONNECTION-COUNT = 16 FRIENDS = $SERVICEHOME/friends -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-topology [datastore] @@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES PORT = 20068 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-datastore ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -110,7 +103,6 @@ AUTOSTART = YES PORT = 20067 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-peerinfo ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -131,15 +123,14 @@ AUTOSTART = YES PORT = 20066 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-ats ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; UNIXPATH = /tmp/test-service-ats-51 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES -WAN_QUOTA_IN = 65536 -WAN_QUOTA_OUT = 65536 +WAN_QUOTA_IN = unlimited +WAN_QUOTA_OUT = unlimited DUMP_MLP = NO DUMP_SOLUTION = NO DUMP_OVERWRITE = NO @@ -153,7 +144,6 @@ AUTOSTART = YES PORT = 20065 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-transport NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; @@ -205,7 +195,6 @@ AUTOSTART = NO PORT = 20060 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-template ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ PORT = 20059 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-fs ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms EXPECTED_NEIGHBOUR_COUNT = 128 [vpn] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-vpn IPV6ADDR = 1234::1 IPV6PREFIX = 32 @@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17 IFNAME = vpn-gnunet [exit] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-exit IPV6ADDR = 1234:1::1 IPV6PREFIX = 32 @@ -264,7 +250,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -275,7 +260,6 @@ PROVIDE_EXIT = NO PORT = 20058 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-arm ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES HTTPPORT = 8080 HOME = $SERVICEHOME HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-hostlist OPTIONS = -b SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ @@ -299,7 +282,6 @@ AUTOSTART = YES PORT = 20057 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-core ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -333,7 +315,6 @@ AUTOSTART = YES PORT = 20055 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-statistics ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -346,7 +327,6 @@ AUTOSTART = YES PORT = 20054 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dht ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -355,6 +335,20 @@ UNIXPATH = /tmp/test-service-dht-43 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES +[chat] +UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + +[dv] +UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + [dhtcache] DATABASE = sqlite -QUOTA = 1 MB
\ No newline at end of file +QUOTA = 1 MB +[consensus] +AUTOSTART = NO + + diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp.conf b/src/integration-tests/confs/c_normal_client_tcp_udp.conf index e568f12..415056f 100644 --- a/src/integration-tests/confs/c_normal_client_tcp_udp.conf +++ b/src/integration-tests/confs/c_normal_client_tcp_udp.conf @@ -1,6 +1,5 @@ [PATHS] SERVICEHOME = /tmp/c_normal_client -DEFAULTCONFIG = confs/c_normal_client_tcp_udp.conf [gnunetd] HOSTKEY = hostkeys/0002-hostkey @@ -19,7 +18,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -31,7 +29,6 @@ AUTOSTART = YES PORT = 20071 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-resolver ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -44,7 +41,6 @@ AUTOSTART = YES PORT = 20070 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-mesh ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -57,7 +53,6 @@ AUTOSTART = YES PORT = 20069 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-nse ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -68,7 +63,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof HISTOGRAM = $SERVICEHOME/nse-history.log WORKDELAY = 5 ms INTERVAL = 1 h -WORKBITS = 26 +WORKBITS = 1 [topology] MINIMUM-FRIENDS = 0 @@ -76,7 +71,6 @@ FRIENDS-ONLY = NO AUTOCONNECT = YES TARGET-CONNECTION-COUNT = 16 FRIENDS = $SERVICEHOME/friends -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-topology [datastore] @@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES PORT = 20068 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-datastore ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -110,7 +103,6 @@ AUTOSTART = YES PORT = 20067 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-peerinfo ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -131,15 +123,14 @@ AUTOSTART = YES PORT = 20066 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-ats ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; UNIXPATH = /tmp/test-service-ats-51 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES -WAN_QUOTA_IN = 65536 -WAN_QUOTA_OUT = 65536 +WAN_QUOTA_IN = unlimited +WAN_QUOTA_OUT = unlimited DUMP_MLP = NO DUMP_SOLUTION = NO DUMP_OVERWRITE = NO @@ -153,7 +144,6 @@ AUTOSTART = YES PORT = 20065 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-transport NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; @@ -205,7 +195,6 @@ AUTOSTART = NO PORT = 20060 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-template ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ PORT = 20059 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-fs ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms EXPECTED_NEIGHBOUR_COUNT = 128 [vpn] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-vpn IPV6ADDR = 1234::1 IPV6PREFIX = 32 @@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17 IFNAME = vpn-gnunet [exit] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-exit IPV6ADDR = 1234:1::1 IPV6PREFIX = 32 @@ -264,7 +250,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -275,7 +260,6 @@ PROVIDE_EXIT = NO PORT = 20058 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-arm ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES HTTPPORT = 8080 HOME = $SERVICEHOME HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-hostlist OPTIONS = -b SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ @@ -299,7 +282,6 @@ AUTOSTART = YES PORT = 20057 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-core ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -333,7 +315,6 @@ AUTOSTART = YES PORT = 20055 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-statistics ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -346,7 +327,6 @@ AUTOSTART = YES PORT = 20054 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dht ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -355,6 +335,20 @@ UNIXPATH = /tmp/test-service-dht-43 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES +[chat] +UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp_udp-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + +[dv] +UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp-1 +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + [dhtcache] DATABASE = sqlite -QUOTA = 1 MB
\ No newline at end of file +QUOTA = 1 MB +[consensus] +AUTOSTART = NO + + diff --git a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf index 93275bf..6edd8cc 100644 --- a/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf +++ b/src/integration-tests/confs/c_normal_client_tcp_udp_http.conf @@ -1,6 +1,5 @@ [PATHS] SERVICEHOME = /tmp/c_normal_client -DEFAULTCONFIG = confs/c_normal_client_tcp_udp_http.conf [gnunetd] HOSTKEY = hostkeys/0002-hostkey @@ -19,7 +18,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -31,7 +29,6 @@ AUTOSTART = YES PORT = 20071 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-resolver ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -44,7 +41,6 @@ AUTOSTART = YES PORT = 20070 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-mesh ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -57,7 +53,6 @@ AUTOSTART = YES PORT = 20069 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-nse ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -68,7 +63,7 @@ PROOFFILE = $SERVICEHOME/.nse-proof HISTOGRAM = $SERVICEHOME/nse-history.log WORKDELAY = 5 ms INTERVAL = 1 h -WORKBITS = 26 +WORKBITS = 1 [topology] MINIMUM-FRIENDS = 0 @@ -76,7 +71,6 @@ FRIENDS-ONLY = NO AUTOCONNECT = YES TARGET-CONNECTION-COUNT = 16 FRIENDS = $SERVICEHOME/friends -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-topology [datastore] @@ -87,7 +81,6 @@ UNIX_MATCH_GID = YES PORT = 20068 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-datastore ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -110,7 +103,6 @@ AUTOSTART = YES PORT = 20067 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-peerinfo ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -131,15 +123,14 @@ AUTOSTART = YES PORT = 20066 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-ats ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; UNIXPATH = /tmp/test-service-ats-51 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES -WAN_QUOTA_IN = 65536 -WAN_QUOTA_OUT = 65536 +WAN_QUOTA_IN = unlimited +WAN_QUOTA_OUT = unlimited DUMP_MLP = NO DUMP_SOLUTION = NO DUMP_OVERWRITE = NO @@ -153,7 +144,6 @@ AUTOSTART = YES PORT = 20065 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-transport NEIGHBOUR_LIMIT = 50 ACCEPT_FROM = 127.0.0.1; @@ -205,7 +195,6 @@ AUTOSTART = NO PORT = 20060 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-template ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -223,7 +212,6 @@ UPDATE_DIR = $SERVICEHOME/updates/ PORT = 20059 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-fs ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -238,7 +226,6 @@ MIN_MIGRATION_DELAY = 100 ms EXPECTED_NEIGHBOUR_COUNT = 128 [vpn] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-vpn IPV6ADDR = 1234::1 IPV6PREFIX = 32 @@ -249,7 +236,6 @@ VIRTDNS6 = 1234::17 IFNAME = vpn-gnunet [exit] -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-exit IPV6ADDR = 1234:1::1 IPV6PREFIX = 32 @@ -264,7 +250,6 @@ AUTOSTART = YES PORT = 0 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dns ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -275,7 +260,6 @@ PROVIDE_EXIT = NO PORT = 20058 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-arm ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -288,7 +272,6 @@ UNIX_MATCH_GID = YES HTTPPORT = 8080 HOME = $SERVICEHOME HOSTLISTFILE = $SERVICEHOME/hostlist/learned.data -CONFIG = $DEFAULTCONFIG BINARY = gnunet-daemon-hostlist OPTIONS = -b SERVERS = http://v9.gnunet.org/hostlist http://ioerror.gnunet.org:65535/ @@ -299,7 +282,6 @@ AUTOSTART = YES PORT = 20057 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-core ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -333,7 +315,6 @@ AUTOSTART = YES PORT = 20055 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-statistics ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -346,7 +327,6 @@ AUTOSTART = YES PORT = 20054 HOSTNAME = localhost HOME = $SERVICEHOME -CONFIG = $DEFAULTCONFIG BINARY = gnunet-service-dht ACCEPT_FROM = 127.0.0.1; ACCEPT_FROM6 = ::1; @@ -355,6 +335,20 @@ UNIXPATH = /tmp/test-service-dht-43 UNIX_MATCH_UID = YES UNIX_MATCH_GID = YES +[chat] +UNIXPATH = /tmp/test-service-chat-c_normal_client_tcp_udp_http +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + +[dv] +UNIXPATH = /tmp/test-service-dv-b_c_normal_client_tcp_udp_http +UNIX_MATCH_UID = YES +UNIX_MATCH_GID = YES + [dhtcache] DATABASE = sqlite -QUOTA = 1 MB
\ No newline at end of file +QUOTA = 1 MB +[consensus] +AUTOSTART = NO + + diff --git a/src/integration-tests/connection_watchdog.c b/src/integration-tests/connection_watchdog.c index ac19338..0998a36 100644 --- a/src/integration-tests/connection_watchdog.c +++ b/src/integration-tests/connection_watchdog.c @@ -121,7 +121,7 @@ struct TransportPlugin *ptail; static int map_check_it (void *cls, - const GNUNET_HashCode * key, + const struct GNUNET_HashCode * key, void *value) { int *fail = cls; @@ -142,7 +142,7 @@ map_check_it (void *cls, static int map_cleanup_it (void *cls, - const GNUNET_HashCode * key, + const struct GNUNET_HashCode * key, void *value) { struct PeerContainer *pc = value; @@ -451,7 +451,7 @@ return mlen; int map_ping_it (void *cls, - const GNUNET_HashCode * key, + const struct GNUNET_HashCode * key, void *value) { struct PeerContainer *pc = value; @@ -572,6 +572,8 @@ map_connect (const struct GNUNET_PeerIdentity *peer, void * source) } pc = GNUNET_CONTAINER_multihashmap_get(peers, &peer->hashPubKey); + GNUNET_assert (NULL != pc); + if (source == th) { if (GNUNET_NO == pc->transport_connected) @@ -658,6 +660,8 @@ map_disconnect (const struct GNUNET_PeerIdentity * peer, void * source) } pc = GNUNET_CONTAINER_multihashmap_get(peers, &peer->hashPubKey); + GNUNET_assert (NULL != pc); + if (source == th) { if (NULL != pc->th_ping) @@ -1052,7 +1056,7 @@ run (void *cls, char *const *args, const char *cfgfile, init(); stats = GNUNET_STATISTICS_create ("watchdog", cfg); - peers = GNUNET_CONTAINER_multihashmap_create (20); + peers = GNUNET_CONTAINER_multihashmap_create (32, GNUNET_NO); th = GNUNET_TRANSPORT_connect(cfg, NULL, NULL, &transport_notify_receive_cb, @@ -1060,7 +1064,7 @@ run (void *cls, char *const *args, const char *cfgfile, &transport_notify_disconnect_cb); GNUNET_assert (th != NULL); GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Connected to transport service\n"); - ch = GNUNET_CORE_connect (cfg, 1, NULL, + ch = GNUNET_CORE_connect (cfg, NULL, &core_init_cb, &core_connect_cb, &core_disconnect_cb, @@ -1090,10 +1094,15 @@ main (int argc, char *const *argv) GNUNET_NO, &GNUNET_GETOPT_set_one, &ping}, GNUNET_GETOPT_OPTION_END }; - return (GNUNET_OK == - GNUNET_PROGRAM_run (argc, argv, "cn", - gettext_noop ("help text"), options, &run, - NULL)) ? ret : 1; + + if (GNUNET_OK != GNUNET_STRINGS_get_utf8_args (argc, argv, &argc, &argv)) + return 2; + ret = (GNUNET_OK == + GNUNET_PROGRAM_run (argc, argv, "cn", + gettext_noop ("help text"), options, &run, + NULL)) ? ret : 1; + GNUNET_free ((void*) argv); + return ret; } /* end of connection_watchdog.c */ diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index 41e709f..0e3cdaa 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in @@ -53,11 +53,13 @@ class Check: if ((False == res) and (execs >= timeout)): print ('Check had timeout after ' +str(timeout)+ ' seconds') neg_cont (self) - elif ((False == res) and (execs >= timeout)): - neg_cont (self) + elif ((False == res) and (execs < timeout)): + if (None != neg_cont): + neg_cont (self) else: - pos_cont (self) - return res + if (None != pos_cont): + pos_cont (self) + return res def run_once (self, pos_cont, neg_cont): execs = 0; res = False diff --git a/src/integration-tests/test_connection_stability.c b/src/integration-tests/test_connection_stability.c deleted file mode 100644 index ce6568b..0000000 --- a/src/integration-tests/test_connection_stability.c +++ /dev/null @@ -1,126 +0,0 @@ -/* - This file is part of GNUnet. - (C) 2009 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 3, 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. -*/ -/** - * @file integretion-tests/test_connection_stability.c - * @brief testcase for connection stability - */ -#include "platform.h" -#include "gnunet_testing_lib.h" - -#define VERBOSE GNUNET_YES - -#define TIMEOUT GNUNET_TIME_relative_multiply (GNUNET_TIME_UNIT_SECONDS, 300) - -static int ok; - -static void -end_cb (void *cls, const char *emsg) -{ - if (emsg != NULL) - { - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Ending with error: %s\n", emsg); - ok = 1; - } - else - { -#if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Daemon terminated, will now exit.\n"); -#endif - ok = 0; - } -} - - - -void -do_shutdown (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) -{ - struct GNUNET_TESTING_Daemon *d = cls; - - GNUNET_TESTING_daemon_stop (d, TIMEOUT, &end_cb, NULL, GNUNET_YES, GNUNET_NO); -} - - -static void -my_cb (void *cls, const struct GNUNET_PeerIdentity *id, - const struct GNUNET_CONFIGURATION_Handle *cfg, - struct GNUNET_TESTING_Daemon *d, const char *emsg) -{ - GNUNET_assert (id != NULL); -#if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, - "Daemon `%s' started, will now stop it.\n", GNUNET_i2s (id)); -#endif - GNUNET_SCHEDULER_add_now (&do_shutdown, d); -} - - -static void -run (void *cls, char *const *args, const char *cfgfile, - const struct GNUNET_CONFIGURATION_Handle *cfg) -{ - struct GNUNET_TESTING_Daemon *d; - - ok = 1; -#if VERBOSE - GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Starting daemon.\n"); -#endif - d = GNUNET_TESTING_daemon_start (cfg, TIMEOUT, GNUNET_NO, NULL, NULL, 0, NULL, - NULL, NULL, &my_cb, NULL); - GNUNET_assert (d != NULL); -} - -static int -check () -{ - char *const argv[] = { "test_connection_stability", - "-c", - "test_connection_stability.conf", -#if VERBOSE - "-L", "DEBUG", -#endif - NULL - }; - struct GNUNET_GETOPT_CommandLineOption options[] = { - GNUNET_GETOPT_OPTION_END - }; - GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv, - "test-testing", "nohelp", options, &run, &ok); - return ok; -} - -int -main (int argc, char *argv[]) -{ - int ret; - - GNUNET_log_setup ("test_connection_stability", -#if VERBOSE - "DEBUG", -#else - "WARNING", -#endif - NULL); - ret = check (); - - return ret; -} - -/* 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 ba2ae05..0000000 --- a/src/integration-tests/test_connection_stability.conf +++ /dev/null @@ -1,82 +0,0 @@ -[PATHS] -SERVICEHOME = /tmp/test_connection_stability/ -DEFAULTCONFIG = test_connection_stability.conf - -[resolver] -PORT = 2564 - -[transport] -PORT = 2565 -PLUGINS = tcp - -[arm] -PORT = 2566 -DEFAULTSERVICES = - -[statistics] -PORT = 2567 - -[transport-tcp] -PORT = 2568 -BINDTO = 127.0.0.1 - -[peerinfo] -PORT = 2569 - -[core] -PORT = 2570 - -[testing] -NUM_PEERS = 5 -WEAKRANDOM = YES -F2F = YES -HOSTKEYSFILE = ../../contrib/testing_hostkeys.dat - -[dht] -AUTOSTART = NO - -[nat] -DISABLEV6 = YES -ENABLE_UPNP = NO -BEHIND_NAT = NO -ALLOW_NAT = NO -INTERNAL_ADDRESS = 127.0.0.1 -EXTERNAL_ADDRESS = 127.0.0.1 -USE_LOCALADDR = NO - -[dns] -AUTOSTART = NO - -[nse] -AUTOSTART = NO - -[mesh] -AUTOSTART = NO - -[datastore] -AUTOSTART = NO - -[fs] -AUTOSTART = NO - -[dv] -AUTOSTART = NO - -[chat] -AUTOSTART = NO - -[vpn] -AUTOSTART = NO - -[gns] -AUTOSTART = NO - -[namestore] -AUTOSTART = NO - -[lockmanager] -AUTOSTART = NO - -[arm] -DEFAULTSERVICES = core - diff --git a/src/integration-tests/test_integration_bootstrap_and_connect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect.py.in index 1e71488..cd3bdbe 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect.py.in @@ -24,7 +24,6 @@ import subprocess import re import shutil import time -import pexpect from gnunet_testing import Peer from gnunet_testing import Test from gnunet_testing import Check @@ -52,14 +51,14 @@ testname = "test_integration_bootstrap_and_connect" verbose = True check_timeout = 180 +if os.name == "nt": + tmp = os.getenv ("TEMP") +else: + tmp = "/tmp" def cleanup (): - 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"), "c_no_nat_client"), True) - else: - shutil.rmtree ("/tmp/c_bootstrap_server/", True) - shutil.rmtree ("/tmp/c_no_nat_client/", True) + shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True) + shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True) def success_cont (check): global success diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in index aefb9cd..3ca0aea 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in @@ -24,7 +24,6 @@ import subprocess import re import shutil import time -import pexpect from gnunet_testing import Peer from gnunet_testing import Test from gnunet_testing import Check @@ -52,14 +51,14 @@ testname = "test_integration_bootstrap_and_connect" verbose = True check_timeout = 180 +if os.name == "nt": + tmp = os.getenv ("TEMP") +else: + tmp = "/tmp" def cleanup (): - 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"), "c_no_nat_client"), True) - else: - shutil.rmtree ("/tmp/c_bootstrap_server/", True) - shutil.rmtree ("/tmp/c_no_nat_client/", True) + shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True) + shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True) def success_server_stop_cont (check): global success diff --git a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in index 88327bf..55982c2 100755 --- a/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in +++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in @@ -24,7 +24,6 @@ import subprocess import re import shutil import time -import pexpect from gnunet_testing import Peer from gnunet_testing import Test from gnunet_testing import Check @@ -52,14 +51,14 @@ testname = "test_integration_bootstrap_and_connect" verbose = True check_timeout = 180 +if os.name == "nt": + tmp = os.getenv ("TEMP") +else: + tmp = "/tmp" def cleanup (): - 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"), "c_no_nat_client"), True) - else: - shutil.rmtree ("/tmp/c_bootstrap_server/", True) - shutil.rmtree ("/tmp/c_no_nat_client/", True) + shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True) + shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True) def success_server_stop_cont (check): global success diff --git a/src/integration-tests/test_integration_clique.py.in b/src/integration-tests/test_integration_clique.py.in index 65c9341..6c7a5d7 100755 --- a/src/integration-tests/test_integration_clique.py.in +++ b/src/integration-tests/test_integration_clique.py.in @@ -30,13 +30,16 @@ import subprocess import re import shutil import time -import pexpect from gnunet_testing import Peer from gnunet_testing import Test from gnunet_testing import Check from gnunet_testing import Condition from gnunet_testing import * +if os.name == "nt": + tmp = os.getenv ("TEMP") +else: + tmp = "/tmp" #definitions @@ -46,14 +49,9 @@ check_timeout = 180 def cleanup (): - 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"), "c_no_nat_client"), True) - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client_2"), True) - else: - shutil.rmtree ("/tmp/c_bootstrap_server/", True) - shutil.rmtree ("/tmp/c_no_nat_client/", True) - shutil.rmtree ("/tmp/c_no_nat_client_2/", True) + shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True) + shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True) + shutil.rmtree (os.path.join (tmp, "c_no_nat_client_2"), True) def success_cont (check): diff --git a/src/integration-tests/test_integration_clique_nat.py.in b/src/integration-tests/test_integration_clique_nat.py.in index 59d1179..a457e8d 100755 --- a/src/integration-tests/test_integration_clique_nat.py.in +++ b/src/integration-tests/test_integration_clique_nat.py.in @@ -31,13 +31,16 @@ import subprocess import re import shutil import time -import pexpect from gnunet_testing import Peer from gnunet_testing import Test from gnunet_testing import Check from gnunet_testing import Condition from gnunet_testing import * +if os.name == "nt": + tmp = os.getenv ("TEMP") +else: + tmp = "/tmp" #definitions testname = "test_integration_clique_nat" @@ -46,14 +49,9 @@ check_timeout = 180 def cleanup (): - if os.name == "nt": - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_bootstrap_server"), True) - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client"), True) - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_nat_client"), True) - else: - shutil.rmtree ("/tmp/c_bootstrap_server/", True) - shutil.rmtree ("/tmp/c_no_nat_client/", True) - shutil.rmtree ("/tmp/c_nat_client/", True) + shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True) + shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True) + shutil.rmtree (os.path.join (tmp, "c_nat_client"), True) def success_cont (check): diff --git a/src/integration-tests/test_integration_connect_on_restart.py.in b/src/integration-tests/test_integration_connect_on_restart.py.in index f77fd1c..0b23c8f 100755 --- a/src/integration-tests/test_integration_connect_on_restart.py.in +++ b/src/integration-tests/test_integration_connect_on_restart.py.in @@ -32,7 +32,6 @@ import subprocess import re import shutil import time -import pexpect from gnunet_testing import Peer from gnunet_testing import Test from gnunet_testing import Check @@ -46,16 +45,15 @@ testname = "test_integration_clique" verbose = True check_timeout = 180 +if os.name == "nt": + tmp = os.getenv ("TEMP") +else: + tmp = "/tmp" def cleanup (): - if os.name == "nt": - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_bootstrap_server"), True) - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client"), True) - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client_2"), True) - else: - shutil.rmtree ("/tmp/c_bootstrap_server/", True) - shutil.rmtree ("/tmp/c_no_nat_client/", True) - shutil.rmtree ("/tmp/c_no_nat_client_2/", True) + shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True) + shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True) + shutil.rmtree (os.path.join (tmp, "c_no_nat_client_2"), True) def success_cont (check): diff --git a/src/integration-tests/test_integration_connection_values_tcp.py.in b/src/integration-tests/test_integration_connection_values_tcp.py.in index d8a92ba..efcf5c7 100755 --- a/src/integration-tests/test_integration_connection_values_tcp.py.in +++ b/src/integration-tests/test_integration_connection_values_tcp.py.in @@ -30,13 +30,16 @@ import subprocess import re import shutil import time -import pexpect from gnunet_testing import Peer from gnunet_testing import Test from gnunet_testing import Check from gnunet_testing import Condition from gnunet_testing import * +if os.name == "nt": + tmp = os.getenv ("TEMP") +else: + tmp = "/tmp" #definitions @@ -46,10 +49,7 @@ check_timeout = 180 def cleanup (): - if os.name == "nt": - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_normal_client"), True) - else: - shutil.rmtree ("/tmp/c_normal_client/", True) + shutil.rmtree (os.path.join (tmp, "c_normal_client"), True) def success_cont (check): diff --git a/src/integration-tests/test_integration_connection_values_tcp_udp.py.in b/src/integration-tests/test_integration_connection_values_tcp_udp.py.in index 11b8266..cfb1043 100755 --- a/src/integration-tests/test_integration_connection_values_tcp_udp.py.in +++ b/src/integration-tests/test_integration_connection_values_tcp_udp.py.in @@ -30,7 +30,6 @@ import subprocess import re import shutil import time -import pexpect from gnunet_testing import Peer from gnunet_testing import Test from gnunet_testing import Check @@ -44,13 +43,13 @@ testname = "test_integration_connection_value" verbose = True check_timeout = 180 +if os.name == "nt": + tmp = os.getenv ("TEMP") +else: + tmp = "/tmp" def cleanup (): - if os.name == "nt": - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_normal_client"), True) - else: - shutil.rmtree ("/tmp/c_normal_client/", True) - + shutil.rmtree (os.path.join (tmp, "c_normal_client"), True) def success_cont (check): global success diff --git a/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in b/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in index 69184a2..4e9e72e 100755 --- a/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in +++ b/src/integration-tests/test_integration_connection_values_tcp_udp_http.py.in @@ -30,13 +30,16 @@ import subprocess import re import shutil import time -import pexpect from gnunet_testing import Peer from gnunet_testing import Test from gnunet_testing import Check from gnunet_testing import Condition from gnunet_testing import * +if os.name == "nt": + tmp = os.getenv ("TEMP") +else: + tmp = "/tmp" #definitions @@ -46,10 +49,7 @@ check_timeout = 180 def cleanup (): - if os.name == "nt": - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_normal_client"), True) - else: - shutil.rmtree ("/tmp/c_normal_client/", True) + shutil.rmtree (os.path.join (tmp, "c_normal_client"), True) def success_cont (check): diff --git a/src/integration-tests/test_integration_disconnect.py.in b/src/integration-tests/test_integration_disconnect.py.in index 6f84f37..2a863f8 100755 --- a/src/integration-tests/test_integration_disconnect.py.in +++ b/src/integration-tests/test_integration_disconnect.py.in @@ -24,7 +24,6 @@ import subprocess import re import shutil import time -import pexpect from gnunet_testing import Peer from gnunet_testing import Test from gnunet_testing import Check @@ -46,14 +45,14 @@ testname = "test_integration_disconnect" verbose = True check_timeout = 180 +if os.name == "nt": + tmp = os.getenv ("TEMP") +else: + tmp = "/tmp" def cleanup (): - if os.name == "nt": - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_bootstrap_server"), True) - shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_no_nat_client"), True) - else: - shutil.rmtree ("/tmp/c_bootstrap_server/", True) - shutil.rmtree ("/tmp/c_no_nat_client/", True) + shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True) + shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True) def success_disconnect_cont (check): diff --git a/src/integration-tests/test_integration_restart.py.in b/src/integration-tests/test_integration_restart.py.in index 26917d0..b3d3ecd 100755 --- a/src/integration-tests/test_integration_restart.py.in +++ b/src/integration-tests/test_integration_restart.py.in @@ -24,7 +24,6 @@ import subprocess import re import shutil import time -import pexpect from gnunet_testing import Peer from gnunet_testing import Test from gnunet_testing import Check @@ -47,14 +46,14 @@ testname = "test_integration_restart" verbose = False check_timeout = 180 +if os.name == "nt": + tmp = os.getenv ("TEMP") +else: + tmp = "/tmp" def cleanup (): - 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"), "c_no_nat_client"), True) - else: - shutil.rmtree ("/tmp/c_bootstrap_server/", True) - shutil.rmtree ("/tmp/c_no_nat_client/", True) + shutil.rmtree (os.path.join (tmp, "c_bootstrap_server"), True) + shutil.rmtree (os.path.join (tmp, "c_no_nat_client"), True) def success_restart_cont (check): |