[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18534 - gnunet/src/integration-tests
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18534 - gnunet/src/integration-tests |
Date: |
Fri, 9 Dec 2011 17:18:51 +0100 |
Author: wachs
Date: 2011-12-09 17:18:51 +0100 (Fri, 09 Dec 2011)
New Revision: 18534
Added:
gnunet/src/integration-tests/test_integration_disconnect.py.in
Modified:
gnunet/src/integration-tests/Makefile.am
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
Log:
disconnect test
Modified: gnunet/src/integration-tests/Makefile.am
===================================================================
--- gnunet/src/integration-tests/Makefile.am 2011-12-09 16:09:04 UTC (rev
18533)
+++ gnunet/src/integration-tests/Makefile.am 2011-12-09 16:18:51 UTC (rev
18534)
@@ -17,7 +17,7 @@
if HAVE_PYTHON_PEXPECT
check_SCRIPTS = \
test_integration_bootstrap_and_connect.py \
- test_integration_clique.py
+ test_integration_disconnect.py
endif
@@ -36,8 +36,14 @@
$(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_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
+
+
EXTRA_DIST = \
- test_integration_bootstrap_and_connect.py.in
+ test_integration_bootstrap_and_connect.py.in \
+ test_integration_disconnect.py.in
# test_integration_clique.py.in
Modified:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
2011-12-09 16:09:04 UTC (rev 18533)
+++ gnunet/src/integration-tests/test_integration_bootstrap_and_connect.py.in
2011-12-09 16:18:51 UTC (rev 18534)
@@ -169,12 +169,12 @@
client_core_connected = True
vprintf ('Client core services is connected')
- if ((False == client_core_session_map) and (True == check_statistics
('./confs/c_bootstrap_server.conf', 'core', '# entries in session map',1))):
- client_core_session_map = True
+ if ((False == server_core_session_map) and (True == check_statistics
('./confs/c_bootstrap_server.conf', 'core', '# entries in session map',1))):
+ server_core_session_map = True
vprintf ('Server core services is connected')
- if ((False == server_core_session_map) and (True == check_statistics
('./confs/c_no_nat_client.conf', 'core', '# entries in session map',1))):
- server_core_session_map = True
+ if ((False == client_core_session_map) and (True == check_statistics
('./confs/c_no_nat_client.conf', 'core', '# entries in session map',1))):
+ client_core_session_map = True
vprintf ('Client core notifies about connected')
if ((False == server_topology_connected) and (True == check_statistics
('./confs/c_bootstrap_server.conf', 'topology', '# peers connected',1))):
@@ -217,7 +217,7 @@
print ('Client core was NOT connected')
if (server_core_connected == False):
print ('Server core was NOT connected')
- if (server_core_session_map == False):
+ if (client_core_session_map == False):
print ('Client core sessions did NOT increase')
if (server_core_session_map == False):
print ('Server core sessions did NOT increase')
Added: gnunet/src/integration-tests/test_integration_disconnect.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_disconnect.py.in
(rev 0)
+++ gnunet/src/integration-tests/test_integration_disconnect.py.in
2011-12-09 16:18:51 UTC (rev 18534)
@@ -0,0 +1,296 @@
address@hidden@
+# 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
+
+#
+# This test tests if a fresh peer bootstraps from a hostlist server and then
+# successfully connects to the server. When both peers are connected
+# in transport, core, topology, fs, the server is shutdown
+#
+# Conditions for successful exit:
+# Both peers have 0 connected peer in transport, core, topology, fs
+
+#definitions
+
+testname = "test_integration_disconnect"
+verbose = False
+gnunetarm = ""
+gnunetstatistics = ""
+success = False
+timeout = 100
+
+#test conditions
+
+
+def vprintf (msg):
+ if verbose == True:
+ print msg
+
+def setup ():
+ srcdir = "../.."
+ gnunet_pyexpect_dir = os.path.join (srcdir, "contrib")
+ if gnunet_pyexpect_dir not in sys.path:
+ sys.path.append (gnunet_pyexpect_dir)
+ from gnunet_pyexpect import pexpect
+ global gnunetarm
+ global gnunetstatistics
+ if os.name == 'posix':
+ gnunetarm = 'gnunet-arm'
+ gnunetstatistics = 'gnunet-statistics'
+ elif os.name == 'nt':
+ gnunetarm = 'gnunet-arm.exe'
+ gnunetstatistics = 'gnunet-statistics.exe'
+ if os.name == "nt":
+ shutil.rmtree (os.path.join (os.getenv ("TEMP"), testname), True)
+ else:
+ shutil.rmtree ("/tmp/" + testname, True)
+
+def start ():
+ vprintf ("Starting bootstrap server & client")
+ try:
+ server = subprocess.Popen ([gnunetarm, '-sq', '-c',
'./confs/c_bootstrap_server.conf'])
+ server.communicate ()
+ except OSError:
+ print "Can not start bootstrap server, exiting..."
+ exit (1)
+ try:
+ client = subprocess.Popen ([gnunetarm, '-sq', '-c',
'confs/c_no_nat_client.conf'])
+ client.communicate ()
+ except OSError:
+ print "Can not start bootstrap client, exiting..."
+ exit (1)
+ vprintf ("Bootstrap server & client started")
+
+def stop ():
+ try:
+ client = subprocess.Popen ([gnunetarm, '-eq', '-c',
'confs/c_no_nat_client.conf'])
+ client.communicate ()
+ except OSError:
+ print "Can not stop bootstrap client, exiting..."
+ exit (1)
+ vprintf ("Bootstrap client stopped")
+
+
+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 check_statistics (conf, subsystem, name, value):
+ from gnunet_pyexpect import pexpect
+ server = pexpect ()
+ server.spawn (None, [gnunetstatistics, '-c', conf ,'-q','-n', name, '-s',
subsystem ], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+ #server.expect ("stdout", re.compile (r""))
+ test = server.read("stdout", 10240)
+ if (test.find(str(value)) == -1):
+ return False
+ else:
+ return True
+
+
+
+def check_connect ():
+ server_transport_connected = False
+ server_topology_connected = False
+ server_core_connected = False
+ server_core_session_map = False
+ server_fs_connected = False
+ client_transport_connected = False
+ client_topology_connected = False
+ client_core_connected = False
+ client_core_session_map = False
+ client_fs_connected = False
+
+ connected = False
+ count = 1
+ while ((connected == False) and (count <= timeout)):
+ # Perform checks
+ if ((False == server_transport_connected) and (True == check_statistics
('./confs/c_bootstrap_server.conf', 'transport', '# peers connected',1))):
+ server_transport_connected = True
+ vprintf ('Server transport services is connected')
+
+ if ((False == client_transport_connected) and (True == check_statistics
('./confs/c_no_nat_client.conf', 'transport', '# peers connected',1))):
+ client_transport_connected = True
+ vprintf ('Client transport services is connected')
+
+ if ((False == server_core_connected) and (True == check_statistics
('./confs/c_bootstrap_server.conf', 'core', '# neighbour entries
allocated',1))):
+ server_core_connected = True
+ vprintf ('Server core services is connected')
+
+ if ((False == client_core_connected) and (True == check_statistics
('./confs/c_no_nat_client.conf', 'core', '# neighbour entries allocated',1))):
+ client_core_connected = True
+ vprintf ('Client core services is connected')
+
+ if ((False == client_core_session_map) and (True == check_statistics
('./confs/c_bootstrap_server.conf', 'core', '# entries in session map',1))):
+ client_core_session_map = True
+ vprintf ('Server core services is connected')
+
+ if ((False == server_core_session_map) and (True == check_statistics
('./confs/c_no_nat_client.conf', 'core', '# entries in session map',1))):
+ server_core_session_map = True
+ vprintf ('Client core notifies about connected')
+
+ if ((False == server_topology_connected) and (True == check_statistics
('./confs/c_bootstrap_server.conf', 'topology', '# peers connected',1))):
+ server_topology_connected = True
+ vprintf ('Server topology services is connected')
+
+ if ((False == client_topology_connected) and (True == check_statistics
('./confs/c_no_nat_client.conf', 'topology', '# peers connected',1))):
+ client_topology_connected = True
+ vprintf ('Client topology services is connected')
+
+ if ((False == client_fs_connected) and (True == check_statistics
('./confs/c_no_nat_client.conf', 'fs', '# peers connected',1))):
+ client_fs_connected = True
+ vprintf ('Client fs services is connected')
+ if ((False == server_fs_connected) and (True == check_statistics
('./confs/c_bootstrap_server.conf', 'fs', '# peers connected',1))):
+ server_fs_connected = True
+ vprintf ('Server fs services is connected')
+
+ # Check if conditions fulfilled
+ if ((True == client_transport_connected) and (True ==
server_transport_connected) and
+ (True == client_topology_connected) and (True ==
server_topology_connected) and
+ (True == client_core_connected) and (True == server_core_connected) and
+ (True == client_core_session_map) and (True == server_core_session_map)
and
+ (True == client_fs_connected) and (True == server_fs_connected)):
+ connected = True
+ break
+ print '.',
+ time.sleep(1)
+ count += 1
+ if (connected == False):
+ print ''
+ if (client_transport_connected == False):
+ print ('Client transport was NOT connected')
+ if (server_transport_connected == False):
+ print ('Server transport was NOT connected')
+ if (client_topology_connected == False):
+ print ('Client topology was NOT connected')
+ if (server_topology_connected == False):
+ print ('Server topology was NOT connected')
+ if (client_core_connected == False):
+ print ('Client core was NOT connected')
+ if (server_core_connected == False):
+ print ('Server core was NOT connected')
+ if (client_core_session_map == False):
+ print ('Client core sessions did NOT increase')
+ if (server_core_session_map == False):
+ print ('Server core sessions did NOT increase')
+ return False
+ else:
+ return True
+
+def check_disconnect ():
+ vprintf ("Shutting down bootstrap server")
+ try:
+ server = subprocess.Popen ([gnunetarm, '-eq', '-c',
'./confs/c_bootstrap_server.conf'])
+ server.communicate ()
+ except OSError:
+ print "Can not stop bootstrap server, exiting..."
+ exit (1)
+
+ client_transport_disconnected = False
+ client_topology_disconnected = False
+ client_core_disconnected = False
+ client_core_session_map = False
+ client_fs_disconnected = False
+
+ disconnected = False
+ count = 1
+ while ((disconnected == False) and (count <= timeout)):
+ if ((False == client_transport_disconnected) and (True ==
check_statistics ('./confs/c_no_nat_client.conf', 'transport', '# peers
connected',0))):
+ client_transport_disconnected = True
+ vprintf ('Client transport services is disconnected')
+
+ if ((False == client_core_disconnected) and (True ==
check_statistics ('./confs/c_no_nat_client.conf', 'core', '# neighbour entries
allocated',0))):
+ client_core_disconnected = True
+ vprintf ('Client core services is disconnected')
+
+ if ((False == client_core_session_map) and (True ==
check_statistics ('./confs/c_no_nat_client.conf', 'core', '# entries in session
map',0))):
+ client_core_session_map = True
+ vprintf ('Client core notifies about disconnected')
+
+ if ((False == client_topology_disconnected) and (True ==
check_statistics ('./confs/c_no_nat_client.conf', 'topology', '# peers
connected',0))):
+ client_topology_disconnected = True
+ vprintf ('Client topology services is disconnected')
+
+ if ((False == client_fs_disconnected) and (True ==
check_statistics ('./confs/c_no_nat_client.conf', 'fs', '# peers
connected',0))):
+ client_fs_disconnected = True
+ vprintf ('Client fs services is disconnected')
+
+ # Check if conditions fulfilled
+ if ((True == client_transport_disconnected) and
+ (True == client_topology_disconnected) and
+ (True == client_core_disconnected) and
+ (True == client_core_session_map) and
+ (True == client_fs_disconnected)):
+ disconnected = True
+ break
+ print '.'
+ time.sleep(1)
+ count += 1
+ if (disconnected == False):
+ print ''
+ if (client_transport_disconnected == False):
+ print ('Client transport was NOT disconnected')
+ if (client_topology_disconnected == False):
+ print ('Client topology was NOT disconnected')
+ if (client_core_disconnected == False):
+ print ('Client core was NOT disconnected')
+ if (server_core_session_map == False):
+ print ('Server core sessions did NOT increase')
+ return False
+ else:
+ return True
+
+#
+# Test execution
+#
+
+vprintf ("Running " + testname)
+setup ()
+start ()
+
+ret = check_connect ()
+if (ret == True):
+ vprintf ('Peers connected')
+ if (True == check_disconnect ()):
+ success = True
+
+stop ()
+
+
+cleanup ()
+
+if (success == False):
+ print ('Test failed')
+ exit (1)
+else:
+ exit (0)
+
+
+
Property changes on:
gnunet/src/integration-tests/test_integration_disconnect.py.in
___________________________________________________________________
Added: svn:executable
+ *
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18534 - gnunet/src/integration-tests,
gnunet <=