[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r20881 - gnunet/src/integration-tests
From: |
gnunet |
Subject: |
[GNUnet-SVN] r20881 - gnunet/src/integration-tests |
Date: |
Tue, 3 Apr 2012 15:33:55 +0200 |
Author: wachs
Date: 2012-04-03 15:33:55 +0200 (Tue, 03 Apr 2012)
New Revision: 20881
Modified:
gnunet/src/integration-tests/gnunet_testing.py.in
gnunet/src/integration-tests/test_integration_connection_value.py.in
Log:
- changes
Modified: gnunet/src/integration-tests/gnunet_testing.py.in
===================================================================
--- gnunet/src/integration-tests/gnunet_testing.py.in 2012-04-03 13:25:29 UTC
(rev 20880)
+++ gnunet/src/integration-tests/gnunet_testing.py.in 2012-04-03 13:33:55 UTC
(rev 20881)
@@ -147,10 +147,8 @@
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 @@
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:
Modified: gnunet/src/integration-tests/test_integration_connection_value.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_connection_value.py.in
2012-04-03 13:25:29 UTC (rev 20880)
+++ gnunet/src/integration-tests/test_integration_connection_value.py.in
2012-04-03 13:33:55 UTC (rev 20881)
@@ -69,15 +69,14 @@
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
#
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r20881 - gnunet/src/integration-tests,
gnunet <=