diff options
| author | Matthias Wachs <wachs@net.in.tum.de> | 2012-04-03 13:33:55 +0000 |
|---|---|---|
| committer | Matthias Wachs <wachs@net.in.tum.de> | 2012-04-03 13:33:55 +0000 |
| commit | e6015b6c65547c353a9c4d73a56e3869592bd502 (patch) | |
| tree | 495933173e7295d967a4556a6a80493bad0cdd39 /src/integration-tests/gnunet_testing.py.in | |
| parent | c4de0806e7d4a0246329fcc88237903a0e291341 (diff) | |
- changes
Diffstat (limited to 'src/integration-tests/gnunet_testing.py.in')
| -rw-r--r-- | src/integration-tests/gnunet_testing.py.in | 11 |
1 files changed, 3 insertions, 8 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: |