Merge lp:~jelmer/brz/timestamp-range into lp:brz

[Jelmer Vernooij]

Handle overflow errors from Python 2 as well.

Handle overflow errors from Python 2 as well.

Without this, the test (which uses random inputs) fails with:

ERROR: breezy.tests.test_timestamp.UnpackHighresDateTests.test_random
----------------------------------------------------------------------
Traceback (most recent call last):
testtools.testresult.real._StringException: Empty attachments:
  log

Traceback (most recent call last):
  File "/<<PKGBUILDDIR>>/breezy/tests/test_timestamp.py", line 141, in test_random
    time.gmtime(t)
ValueError: timestamp out of range for platform time_t

----------------------------------------------------------------------
Ran 30616 tests in 460.561s

[Martin Packman (gz)]

Thanks!

review: Approve

=== modified file 'breezy/tests/test_timestamp.py'
--- breezy/tests/test_timestamp.py	2018-11-12 01:41:38 +0000
+++ breezy/tests/test_timestamp.py	2018-11-21 22:18:12 +0000
@@ -139,7 +139,7 @@
             t += random.random() * 24 * 3600 * 30
             try:
                 time.gmtime(t)
-            except OverflowError:
+            except (OverflowError, ValueError):
                 # We've reached the maximum for time_t on this platform
                 break
             if time.localtime(t).tm_year > 9998: