Rev 3034: Update from trivialities branch and stop using EqualFloat. in http://people.ubuntu.com/~robertc/baz2.0/nested-pb
Robert Collins
robertc at robertcollins.net
Wed Nov 21 00:44:19 GMT 2007
At http://people.ubuntu.com/~robertc/baz2.0/nested-pb
------------------------------------------------------------
revno: 3034
revision-id:robertc at robertcollins.net-20071121004412-0dmofk2viixoa21s
parent: robertc at robertcollins.net-20071120232331-1se1u6rrqgyqfcae
parent: robertc at robertcollins.net-20071121001635-xu5ddwu2f8tykf8p
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pb.simplify
timestamp: Wed 2007-11-21 11:44:12 +1100
message:
Update from trivialities branch and stop using EqualFloat.
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_progress.py test_progress.py-20060308160359-978c397bc79b7fda
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3009.2.1
revision-id:robertc at robertcollins.net-20071121001635-xu5ddwu2f8tykf8p
parent: robertc at robertcollins.net-20071119195948-n46szsvkgl0c9lj4
committer: Robert Collins <robertc at robertcollins.net>
branch nick: trivialities
timestamp: Wed 2007-11-21 11:16:35 +1100
message:
Remove obsolete demo and run tests from bzrlib.progress.
modified:
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
=== modified file 'bzrlib/progress.py'
--- a/bzrlib/progress.py 2007-11-20 23:23:31 +0000
+++ b/bzrlib/progress.py 2007-11-21 00:44:12 +0000
@@ -842,40 +842,3 @@
"""Tick the task forward, and update the display."""
self._task.tick()
self._display.task_changed()
-
-
-def run_tests():
- import doctest
- result = doctest.testmod()
- if result[1] > 0:
- if result[0] == 0:
- print "All tests passed"
- else:
- print "No tests to run"
-
-
-def demo():
- sleep = time.sleep
-
- print 'dumb-terminal test:'
- pb = DotsProgressBar()
- for i in range(100):
- pb.update('Leoparden', i, 99)
- sleep(0.1)
- sleep(1.5)
- pb.clear()
- sleep(1.5)
-
- print 'smart-terminal test:'
- pb = _ProgressBar(show_pct=True, show_bar=True, show_spinner=False)
- for i in range(100):
- pb.update('Elephanten', i, 99)
- sleep(0.1)
- sleep(2)
- pb.clear()
- sleep(1)
-
- print 'done!'
-
-if __name__ == "__main__":
- demo()
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2007-11-20 22:16:30 +0000
+++ b/bzrlib/tests/__init__.py 2007-11-21 00:44:12 +0000
@@ -873,13 +873,6 @@
raise AssertionError(message +
self._ndiff_strings(a, b))
- def assertEqualFloat(self, left, right):
- """Assert that two floats are within 0.000001 of each other."""
- difference = left - right
- if abs(difference) < 0.000001:
- return
- self.fail("%s != %s" % (left, right))
-
def assertEqualMode(self, mode, mode_test):
self.assertEqual(mode, mode_test,
'mode mismatch %o != %o' % (mode, mode_test))
=== modified file 'bzrlib/tests/test_progress.py'
--- a/bzrlib/tests/test_progress.py 2007-11-20 23:23:31 +0000
+++ b/bzrlib/tests/test_progress.py 2007-11-21 00:44:12 +0000
@@ -413,15 +413,15 @@
# Choose a tick size which will not sum to 100% to test rounding at the
# top.
task.tick_size = 0.23
- self.assertEqualFloat(0.0, task.percent_complete())
- task.tick()
- self.assertEqualFloat(0.23, task.percent_complete())
- task.tick()
- self.assertEqualFloat(0.46, task.percent_complete())
- task.tick()
- self.assertEqualFloat(0.69, task.percent_complete())
- task.tick()
- self.assertEqualFloat(0.92, task.percent_complete())
+ self.assertAlmostEqual(0.0, task.percent_complete())
+ task.tick()
+ self.assertAlmostEqual(0.23, task.percent_complete())
+ task.tick()
+ self.assertAlmostEqual(0.46, task.percent_complete())
+ task.tick()
+ self.assertAlmostEqual(0.69, task.percent_complete())
+ task.tick()
+ self.assertAlmostEqual(0.92, task.percent_complete())
# At > 100% it is capped. Alternatively we could error to enforce good
# api usage (should be rounding down not up to give monotonic
# behaviour, but this seems nice to clients of the api for now.
@@ -501,15 +501,15 @@
# Choose a tick size which will not sum to 100% to test rounding at the
# top.
stack.tick_size = 0.23
- self.assertEqualFloat(0.0, stack.percent_complete())
- stack.tick()
- self.assertEqualFloat(0.23, stack.percent_complete())
- stack.tick()
- self.assertEqualFloat(0.46, stack.percent_complete())
- stack.tick()
- self.assertEqualFloat(0.69, stack.percent_complete())
- stack.tick()
- self.assertEqualFloat(0.92, stack.percent_complete())
+ self.assertAlmostEqual(0.0, stack.percent_complete())
+ stack.tick()
+ self.assertAlmostEqual(0.23, stack.percent_complete())
+ stack.tick()
+ self.assertAlmostEqual(0.46, stack.percent_complete())
+ stack.tick()
+ self.assertAlmostEqual(0.69, stack.percent_complete())
+ stack.tick()
+ self.assertAlmostEqual(0.92, stack.percent_complete())
# At > 100% it is capped. Alternatively we could error to enforce good
# api usage (should be rounding down not up to give monotonic
# behaviour, but this seems nice to clients of the api for now.
@@ -525,20 +525,20 @@
# Choose a tick size which will not sum to 100% to test rounding at the
# top.
stack.push_task(task)
- self.assertEqualFloat(0.0, stack.percent_complete())
+ self.assertAlmostEqual(0.0, stack.percent_complete())
task.tick()
- self.assertEqualFloat(0.0, stack.percent_complete())
+ self.assertAlmostEqual(0.0, stack.percent_complete())
# adding a KnownLengthTask under the CountedTask is ignored by
# percent_complete because the CountedTask prevents estimation.
stack.push_task(task_2)
- self.assertEqualFloat(0.0, stack.percent_complete())
+ self.assertAlmostEqual(0.0, stack.percent_complete())
task_2.tick()
- self.assertEqualFloat(0.0, stack.percent_complete())
+ self.assertAlmostEqual(0.0, stack.percent_complete())
stack.pop_task(task_2)
- self.assertEqualFloat(0.0, stack.percent_complete())
+ self.assertAlmostEqual(0.0, stack.percent_complete())
stack.pop_task(task)
stack.tick()
- self.assertEqualFloat(1.0, stack.percent_complete())
+ self.assertAlmostEqual(1.0, stack.percent_complete())
def test_percent_complete_known_length_task_child(self):
# With a KnownLengthTask children, TaskStack's percentage complete
@@ -548,25 +548,25 @@
task_2 = KnownLengthTask("reading", 5)
stack.tick() # 50%
stack.push_task(task)
- self.assertEqualFloat(0.5, stack.percent_complete())
+ self.assertAlmostEqual(0.5, stack.percent_complete())
task.tick() # 50% + 0.5 * 20%
- self.assertEqualFloat(0.5 + 0.5 * 0.2, stack.percent_complete())
+ self.assertAlmostEqual(0.5 + 0.5 * 0.2, stack.percent_complete())
stack.push_task(task_2) # no progress yet
- self.assertEqualFloat(0.5 + 0.5 * 0.2, stack.percent_complete())
+ self.assertAlmostEqual(0.5 + 0.5 * 0.2, stack.percent_complete())
task_2.tick() # 50% + 0.5 * 20% + 0.5*0.2 * 20%
- self.assertEqualFloat(0.5 + 0.5 * 0.2 + 0.5*0.2*0.2,
+ self.assertAlmostEqual(0.5 + 0.5 * 0.2 + 0.5*0.2*0.2,
stack.percent_complete())
task_2.tick()
- self.assertEqualFloat(0.5 + 0.5 * 0.2 + 0.5*0.2*0.4,
+ self.assertAlmostEqual(0.5 + 0.5 * 0.2 + 0.5*0.2*0.4,
stack.percent_complete())
stack.pop_task(task_2)
- self.assertEqualFloat(0.5 + 0.5 * 0.2, stack.percent_complete())
+ self.assertAlmostEqual(0.5 + 0.5 * 0.2, stack.percent_complete())
task.tick() # 50% + 0.5 * 40% in the child
- self.assertEqualFloat(0.5 + 0.5 * 0.4, stack.percent_complete())
+ self.assertAlmostEqual(0.5 + 0.5 * 0.4, stack.percent_complete())
stack.pop_task(task)
- self.assertEqualFloat(0.5, stack.percent_complete())
+ self.assertAlmostEqual(0.5, stack.percent_complete())
stack.tick() # 100%
- self.assertEqualFloat(1.0, stack.percent_complete())
+ self.assertAlmostEqual(1.0, stack.percent_complete())
class TestSilentTaskDisplay(TestCase):
=== modified file 'bzrlib/tests/test_selftest.py'
--- a/bzrlib/tests/test_selftest.py 2007-11-20 22:16:30 +0000
+++ b/bzrlib/tests/test_selftest.py 2007-11-21 00:44:12 +0000
@@ -1442,10 +1442,6 @@
],
result.calls)
- def test_assertEqualFloat(self):
- self.assertEqualFloat(0, 0.0000001)
- self.assertRaises(AssertionError, self.assertEqualFloat, 0, 0.000002)
-
@symbol_versioning.deprecated_function(zero_eleven)
def sample_deprecated_function():
More information about the bazaar-commits
mailing list