From 598349666a7d4afd68c9b4192faf63d5ea836299 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Tue, 3 Apr 2012 13:06:59 +0000 Subject: - changes --- src/integration-tests/gnunet_testing.py.in | 4 ++-- .../test_integration_connection_value.py.in | 23 +++++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) (limited to 'src/integration-tests') diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index 4cfa051f2..fa8af728c 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in @@ -190,10 +190,10 @@ class EqualStatisticsCondition (Condition): fail = "" op = " == " if ((self.fulfilled == False) and (failed_only == True)): - print self.peer.id[:4] + " " + self.subsystem.ljust(12) + " " + self.result +" " + self.peer2.id[:4] + " " + self.subsystem2.ljust(12) + " " + self.result2 + print self.peer.id[:4] + " " + self.subsystem.ljust(12) + " " + str(self.result) +" " + self.peer2.id[:4] + " " + self.subsystem2.ljust(12) + " " + str(self.result2) #print self.peer.id[:4] + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : (expected/real value) ' + str(self.value) + op + res + fail elif (failed_only == False): - print self.peer.id[:4] + " " + self.subsystem.ljust(12) + " " + self.result +" " + self.peer2.id[:4] + " " + self.subsystem2.ljust(12) + " " + self.result2 + print self.peer.id[:4] + " " + self.subsystem.ljust(12) + " " + str(self.result) +" " + self.peer2.id[:4] + " " + self.subsystem2.ljust(12) + " " + str(self.result2) return self.fulfilled class Test: diff --git a/src/integration-tests/test_integration_connection_value.py.in b/src/integration-tests/test_integration_connection_value.py.in index 47e4dee88..cb9a1378e 100755 --- a/src/integration-tests/test_integration_connection_value.py.in +++ b/src/integration-tests/test_integration_connection_value.py.in @@ -47,10 +47,9 @@ 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) + shutil.rmtree (os.path.join (os.getenv ("TEMP"), "c_normal_client"), True) else: - shutil.rmtree ("/tmp/c_no_nat_client/", True) + shutil.rmtree ("/tmp/c_normal_client/", True) def success_cont (check): @@ -66,13 +65,17 @@ def fail_cont (check): def check_connect (): check = Check (test) check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# neighbour entries allocated')) + #check.add (EqualStatisticsCondition (client, 'transport', '# peers connected', client, 'core', '# entries in session map')) + #check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client, 'core', '# entries in session map')) -# while True == check.run_once (check_timeout, None, None): -# print "Yes" + while True: + res = check.run_once (None, None) + print "Values are equal" + check.evaluate (False) + if (False == res): + break + time.sleep (1) - res = check.run_once (None, None) - print "RES " + str(res) - # # Test execution # @@ -86,7 +89,7 @@ def run (): test = Test ('test_integration_connection_value', verbose) - client = Peer(test, './confs/c_no_nat_client.conf'); + client = Peer(test, './confs/c_normal_client.conf'); client.start(); if (client.started == True): @@ -108,9 +111,7 @@ try: run () except (KeyboardInterrupt, SystemExit): print 'Test interrupted' - server.stop () client.stop () - client2.stop () cleanup () if (success == False): sys.exit(1) -- cgit v1.2.3