[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r31489 - gnunet/src/integration-tests
From: |
gnunet |
Subject: |
[GNUnet-SVN] r31489 - gnunet/src/integration-tests |
Date: |
Tue, 17 Dec 2013 17:24:39 +0100 |
Author: wachs
Date: 2013-12-17 17:24:39 +0100 (Tue, 17 Dec 2013)
New Revision: 31489
Removed:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
Log:
unused test
Deleted:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
===================================================================
---
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
2013-12-17 16:23:15 UTC (rev 31488)
+++
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect.py.in
2013-12-17 16:24:39 UTC (rev 31489)
@@ -1,165 +0,0 @@
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
-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 = False
-check_timeout = 180
-
-if os.name == "nt":
- tmp = os.getenv ("TEMP")
-else:
- tmp = "/tmp"
-
-def cleanup ():
- retries = 10
- path = os.path.join (tmp, "c_bootstrap_server")
- test.p ("Removing " + path)
- while ((os.path.exists(path)) and (retries > 0)):
- shutil.rmtree ((path), False)
- time.sleep (1)
- retries -= 1
- if (os.path.exists(path)):
- test.p ("Failed to remove " + path)
-
-
- retries = 10
- path = os.path.join (tmp, "c_no_nat_client")
- test.p ("Removing " + path)
- while ((os.path.exists(path)) and (retries > 0)):
- shutil.rmtree ((path), False)
- time.sleep (1)
- retries -= 1
- if (os.path.exists(path)):
- test.p ("Failed to remove " + path)
-
-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', '# peers connected',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', '# peers connected',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', '# peers connected',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)
- cleanup ()
-
- 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
Deleted:
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
===================================================================
---
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
2013-12-17 16:23:15 UTC (rev 31488)
+++
gnunet/src/integration-tests/test_integration_bootstrap_and_connect_and_disconnect_nat.py.in
2013-12-17 16:24:39 UTC (rev 31489)
@@ -1,165 +0,0 @@
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
-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 = False
-check_timeout = 180
-
-if os.name == "nt":
- tmp = os.getenv ("TEMP")
-else:
- tmp = "/tmp"
-
-def cleanup ():
- retries = 10
- path = os.path.join (tmp, "c_bootstrap_server")
- test.p ("Removing " + path)
- while ((os.path.exists(path)) and (retries > 0)):
- shutil.rmtree ((path), False)
- time.sleep (1)
- retries -= 1
- if (os.path.exists(path)):
- test.p ("Failed to remove " + path)
-
-
- retries = 10
- path = os.path.join (tmp, "c_nat_client")
- test.p ("Removing " + path)
- while ((os.path.exists(path)) and (retries > 0)):
- shutil.rmtree ((path), False)
- time.sleep (1)
- retries -= 1
- if (os.path.exists(path)):
- test.p ("Failed to remove " + path)
-
-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', '# peers connected',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', '# peers connected',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', '# peers connected',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)
- cleanup ()
-
- server = Peer(test, './confs/c_bootstrap_server.conf');
- client = Peer(test, './confs/c_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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r31489 - gnunet/src/integration-tests,
gnunet <=