[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18634 - gnunet/src/integration-tests
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18634 - gnunet/src/integration-tests |
Date: |
Fri, 16 Dec 2011 17:27:59 +0100 |
Author: wachs
Date: 2011-12-16 17:27:59 +0100 (Fri, 16 Dec 2011)
New Revision: 18634
Modified:
gnunet/src/integration-tests/gnunet_testing.py.in
gnunet/src/integration-tests/test_integration_clique_nat.py.in
Log:
improvements and fixes
Modified: gnunet/src/integration-tests/gnunet_testing.py.in
===================================================================
--- gnunet/src/integration-tests/gnunet_testing.py.in 2011-12-16 16:12:20 UTC
(rev 18633)
+++ gnunet/src/integration-tests/gnunet_testing.py.in 2011-12-16 16:27:59 UTC
(rev 18634)
@@ -125,22 +125,20 @@
else:
return True
def eval(self, failed_only):
+ if (self.result == -1):
+ res = 'NaN'
+ else:
+ res = str(self.result)
+ if (self.fulfilled == False):
+ fail = " FAIL!"
+ op = " != "
+ else:
+ fail = ""
+ op = " == "
if ((self.fulfilled == False) and (failed_only == True)):
- if (self.fulfilled == False):
- fail = " FAIL!"
- op = " != "
- else:
- fail = ""
- op = " == "
- print self.peer.cfg + " " + str(self.type) + ' condition in
subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : '
+ str(self.value) + op + str(self.result) + fail
+ print self.peer.cfg + " " + str(self.type) + ' condition in
subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : '
+ str(self.value) + op + res + fail
elif (failed_only == False):
- if (self.fulfilled == False):
- fail = " FAIL!"
- op = " != "
- else:
- fail = ""
- op = " == "
- print self.peer.cfg + " " + str(self.type) + ' condition in
subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : '
+ str(self.value) + op + str(self.result) + fail
+ print self.peer.cfg + " " + str(self.type) + ' condition in
subsystem "' + self.subsystem.ljust(12) +'" : "' + self.name.ljust(30) +'" : '
+ str(self.value) + op + res + fail
return self.fulfilled
class Test:
Modified: gnunet/src/integration-tests/test_integration_clique_nat.py.in
===================================================================
--- gnunet/src/integration-tests/test_integration_clique_nat.py.in
2011-12-16 16:12:20 UTC (rev 18633)
+++ gnunet/src/integration-tests/test_integration_clique_nat.py.in
2011-12-16 16:27:59 UTC (rev 18634)
@@ -42,7 +42,7 @@
#definitions
testname = "test_integration_clique_nat"
verbose = True
-check_timeout = 120
+check_timeout = 30
def cleanup ():
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18634 - gnunet/src/integration-tests,
gnunet <=