Merge lp:~jelmer/bzr/fix-float into lp:bzr

[Jelmer Vernooij]

Inline testtools private method to fix an issue in xenial (the private implementation has changed in an backward incompatible way).

Copy in _delta_to_float() from testtools, rather than calling a private function that may change without notice.

[Richard Wilbur (richard-wilbur)]

Looks good Jelmer, thanks for removing a call of someone else's private function!
+1

review: Approve

[Vincent Ladeuil (vila)]

Damn, too bad I came here so late: https://bazaar.launchpad.net/~canonical-platform-qa/uci-tests/trunk/revision/179

So obviously +1 from me ;)

review: Approve

[Vincent Ladeuil (vila)]

sent to pqm by email

=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2013-08-09 15:09:23 +0000
+++ bzrlib/tests/__init__.py	2015-11-08 15:32:31 +0000
@@ -32,6 +32,7 @@
 import errno
 import itertools
 import logging
+import math
 import os
 import platform
 import pprint
@@ -359,10 +360,19 @@
             return float(''.join(details['benchtime'].iter_bytes()))
         return getattr(testCase, "_benchtime", None)
 
+    def _delta_to_float(self, a_timedelta, precision):
+        # This calls ceiling to ensure that the most pessimistic view of time
+        # taken is shown (rather than leaving it to the Python %f operator
+        # to decide whether to round/floor/ceiling. This was added when we
+        # had pyp3 test failures that suggest a floor was happening.
+        shift = 10 ** precision
+        return math.ceil((a_timedelta.days * 86400.0 + a_timedelta.seconds +
+            a_timedelta.microseconds / 1000000.0) * shift) / shift
+
     def _elapsedTestTimeString(self):
         """Return a time string for the overall time the current test has taken."""
         return self._formatTime(self._delta_to_float(
-            self._now() - self._start_datetime))
+            self._now() - self._start_datetime, 3))
 
     def _testTimeString(self, testCase):
         benchmark_time = self._extractBenchmarkTime(testCase)