From e6015b6c65547c353a9c4d73a56e3869592bd502 Mon Sep 17 00:00:00 2001 From: Matthias Wachs Date: Tue, 3 Apr 2012 13:33:55 +0000 Subject: [PATCH] - changes --- src/integration-tests/gnunet_testing.py.in | 11 +++-------- .../test_integration_connection_value.py.in | 3 +-- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/integration-tests/gnunet_testing.py.in b/src/integration-tests/gnunet_testing.py.in index 253797249..d935bc419 100644 --- a/src/integration-tests/gnunet_testing.py.in +++ b/src/integration-tests/gnunet_testing.py.in @@ -147,10 +147,8 @@ class StatisticsCondition (Condition): else: fail = "" op = " == " - if ((self.fulfilled == False) and (failed_only == True)): + if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)): print self.peer.id[:4] + " " +self.peer.cfg + " " + 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.peer.cfg + " " + str(self.type) + ' condition in subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : (expected/real value) ' + str(self.value) + op + res + fail return self.fulfilled # Specify two statistic values and check if they are equal @@ -192,11 +190,8 @@ class EqualStatisticsCondition (Condition): else: fail = "" op = " == " - if ((self.fulfilled == False) and (failed_only == True)): - 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) + " " + str(self.result) +" " + self.peer2.id[:4] + " " + self.subsystem2.ljust(12) + " " + str(self.result2) + if (((self.fulfilled == False) and (failed_only == True)) or (failed_only == False)): + print self.peer.id[:4] + ' "' + self.subsystem.ljust(12) + '" "' + self.name.ljust(30) + '" == ' + str(self.result) +" " + self.peer2.id[:4] + ' "' + self.subsystem2.ljust(12) + '" '+ self.name2.ljust(30) + '" ' + 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 29b1dfaa5..38bf633dd 100755 --- a/src/integration-tests/test_integration_connection_value.py.in +++ b/src/integration-tests/test_integration_connection_value.py.in @@ -69,14 +69,13 @@ def check_connect (): check.add (EqualStatisticsCondition (client, 'core', '# neighbour entries allocated', client, 'core', '# entries in session map')) while True: - time.sleep (5) check.reset() res = check.run_once (None, None) print "Values are equal" check.evaluate (False) #if (False == res): # break - + time.sleep (5) # # Test execution -- 2.25.1