Revision: 4060
Author: pekka.klarck
Date: Wed Sep 8 07:09:36 2010
Log: removed utest that failed on py27 that calculates with floats better
than earlier versions. also a little cleanup.
http://code.google.com/p/robotframework/source/detail?r=4060
Modified:
/trunk/src/robot/serializing/statserializers.py
/trunk/utest/serializing/test_percentages.py
=======================================
--- /trunk/src/robot/serializing/statserializers.py Mon May 31 05:21:54 2010
+++ /trunk/src/robot/serializing/statserializers.py Wed Sep 8 07:09:36 2010
@@ -234,9 +234,9 @@
return 0.0, 0.0
# Make small percentages better visible
if 0 < num1 < 1:
- num1, num2= 1.0, 99.0
+ num1, num2 = 1.0, 99.0
if 0 < num2 < 1:
- num1, num2= 99.0, 1.0
+ num1, num2 = 99.0, 1.0
# Handle situation where both are rounded up
while num1 + num2 > 100:
num1, num2 = self._subtract_from_larger(num1, num2, 0.1)
=======================================
--- /trunk/utest/serializing/test_percentages.py Thu May 27 07:11:21 2010
+++ /trunk/utest/serializing/test_percentages.py Wed Sep 8 07:09:36 2010
@@ -10,8 +10,7 @@
def _verify_percents(self, input, expected):
p = _Percents(*input)
- assert_equals(p.pass_percent, expected[0])
- assert_equals(p.fail_percent, expected[1])
+ assert_equals((p.pass_percent, p.fail_percent), expected)
def test_calc_percents_zeros(self):
self._verify_percents((0, 0), (0, 0))
@@ -54,8 +53,7 @@
def test_calc_percents_rounding_both_up(self):
for in1, in2, ex1, ex2 in [ (3, 13, 18.8, 81.3),
- (105, 9895, 1.1, 99.0),
- (4445, 5555, 44.5, 55.6) ]:
+ (105, 9895, 1.1, 99.0) ]:
self._verify_percents((in1, in2), (ex1, ex2))
self._verify_percents((in2, in1), (ex2, ex1))
