From d509bb66653383b4876cb1cb736047b5f84e10ce Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Fri, 17 Feb 2012 10:25:07 +0000 Subject: [PATCH] - new test --- src/integration-tests/Makefile.am | 6 + ...bootstrap_and_connect_and_disconnect.py.in | 147 ++++++++++++++++++ 2 files changed, 153 insertions(+) create mode 100755 src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in diff --git a/src/integration-tests/Makefile.am b/src/integration-tests/Makefile.am index feebde269..e0b151158 100644 --- a/src/integration-tests/Makefile.am +++ b/src/integration-tests/Makefile.am @@ -20,6 +20,7 @@ noinst_SCRIPTS = \ if HAVE_PYTHON_PEXPECT check_SCRIPTS = \ test_integration_bootstrap_and_connect.py \ + test_integration_bootstrap_and_connect_and_disconnect.py \ test_integration_restart.py \ test_integration_clique.py \ test_integration_clique_nat.py @@ -50,6 +51,11 @@ test_integration_bootstrap_and_connect.py: test_integration_bootstrap_and_connec $(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect.py.in > test_integration_bootstrap_and_connect.py chmod +x test_integration_bootstrap_and_connect.py + +test_integration_bootstrap_and_connect_and_disconnect.py.in: test_integration_bootstrap_and_connect_and_disconnect.py.in Makefile + $(do_subst) < $(srcdir)/test_integration_bootstrap_and_connect_and_disconnect.py.in > test_integration_bootstrap_and_connect_and_disconnect.py + chmod +x test_integration_bootstrap_and_connect_and_disconnect.py + test_integration_disconnect.py: test_integration_disconnect.py.in Makefile $(do_subst) < $(srcdir)/test_integration_disconnect.py.in > test_integration_disconnect.py chmod +x test_integration_disconnect.py 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 new file mode 100755 index 000000000..e0eadfa88 --- /dev/null +++ b/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in @@ -0,0 +1,147 @@ +#!/usr/bin/python +# This file is part of GNUnet. +# (C) 2010 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 2, 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. +# +# +import sys +import os +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 * + + +# +# This test tests if a fresh peer bootstraps from a hostlist server and then +# successfully connects to the server +# +# Conditions for successful exit: +# Both peers have 1 connected peer in transport, core, topology, fs + +# +# This test tests if a fresh peer bootstraps from a hostlist server and then +# successfully connects to the server +# +# Conditions for successful exit: +# Both peers have 1 connected peer in transport, core, topology, fs + +#definitions + +testname = "test_integration_bootstrap_and_connect" +verbose = True +check_timeout = 30 + + +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) + +def success_server_stop_cont (check): + global success + success = True; + +def success_cont (check): + server.stop() + + check = Check (test) + check.add (StatisticsCondition (client, 'transport', '# peers connected',0)) + check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',0)) + check.add (StatisticsCondition (client, 'core', '# entries in session map',0)) + check.add (StatisticsCondition (client, 'topology', '# peers connected',0)) + check.add (StatisticsCondition (client, 'fs', '# peers connected',0)) + + check.run_blocking (check_timeout, success_server_stop_cont, fail_cont) + +def fail_cont (check): + global success + success = False; + check.evaluate(True) + +def check (): + check = Check (test) + check.add (StatisticsCondition (client, 'transport', '# peers connected',1)) + check.add (StatisticsCondition (client, 'core', '# neighbour entries allocated',1)) + check.add (StatisticsCondition (client, 'core', '# entries in session map',1)) + check.add (StatisticsCondition (client, 'topology', '# peers connected',1)) + check.add (StatisticsCondition (client, 'fs', '# peers connected',1)) + + + check.add (StatisticsCondition (server, 'transport', '# peers connected',1)) + check.add (StatisticsCondition (server, 'core', '# neighbour entries allocated',1)) + check.add (StatisticsCondition (server, 'core', '# entries in session map',1)) + check.add (StatisticsCondition (server, 'topology', '# peers connected',1)) + check.add (StatisticsCondition (server, 'fs', '# peers connected',1)) + + check.run_blocking (check_timeout, success_cont, fail_cont) + +# +# Test execution +# + +def run (): + global success + global test + global server + global client + + success = False + test = Test ('test_integration_bootstrap_and_connect.py', verbose) + + server = Peer(test, './confs/c_bootstrap_server.conf'); + client = Peer(test, './confs/c_no_nat_client.conf'); + + assert (True == server.start()); + assert (True == client.start()); + + if ((client.started == True) and (server.started == True)): + test.p ('Peers started, running check') + time.sleep(5) + check () + server.stop () + client.stop () + + cleanup () + + if (success == False): + print ('Test failed') + return False + else: + return True + +try: + run () +except (KeyboardInterrupt, SystemExit): + print 'Test interrupted' + server.stop () + client.stop () + cleanup () +if (success == False): + sys.exit(1) +else: + sys.exit(0) + \ No newline at end of file -- 2.25.1