Merge pull request #236 from daira/2725.timezone-test.0

Fix tests on platforms without time.tzset (e.g. Windows)

diff --git a/Makefile b/Makefile
index 6df6bd6adf0b48358e7a45d35f4542462dbcf573..89e2b41b6911c905b0d701dfff86e90b0e56bbd9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,8 @@ default: build
 
 PYTHON=python
 export PYTHON
+PYFLAKES=pyflakes
+export PYFLAKES
 
 # setup.py will extend sys.path to include our support/lib/... directory
 # itself. It will also create it in the beginning of the 'develop' command.
@@ -132,7 +134,7 @@ check-miscaptures:
 
 .PHONY: pyflakes
 pyflakes:
-       @$(PYTHON) -OOu `which pyflakes` $(SOURCES) |sort |uniq
+       $(PYFLAKES) $(SOURCES) |sort |uniq
        @echo
 
 .PHONY: check-umids

diff --git a/NEWS.rst b/NEWS.rst
index 8e19c01868415c3c5f50365bb40ff1f4ff598578..1e860f4d26d6e80aeae45a51d8debb4020f6a983 100644 (file)
--- a/NEWS.rst
+++ b/NEWS.rst
@@ -12,7 +12,37 @@ Compatibility and Dependency Updates
 Tahoe now requires Python 2.7 on all platforms. (#2445)
 
 Tahoe now requires Foolscap 0.10.1, which fixes incompatibilities with recent
-Twisted releases. (#2722, #2567)
+Twisted releases. (#2510, #2722, #2567)
+
+Tests should work with both Nevow 0.11 and 0.12 (#2663)
+
+Configuration Changes
+---------------------
+
+Leif's "preferred storage servers" was landed in revision 96eaca6. This adds
+"peers.preferred" to tahoe.cfg
+
+Aliases can (probably) be unicode.
+
+The introducer's "set_encoding_parameters" feature was removed.
+
+Other Fixes
+-----------
+
+Note: if these tickets are not user visible, they do not need to be explained
+here: merely listing the ticket numbers is sufficient.
+
+#2493: OS-X packaging improvements, so new installs will remove previous ones
+
+2499, 2511, 2567, 2556, 2663, 2723, 2543
+
+#1077: use standard time format in all WUI messages
+
+#1973: welcome-page cleanup: durations instead of timestamps, replace
+"announced" with "last received", remove "storage" column
+
+#1949, #2137: tahoe ls: remove -u shortcut for "--uri", leaving it for
+global --node-url option.
 
 Release 1.10.2 (2015-07-30)
 '''''''''''''''''''''''''''

diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py
index be5541e8852d79f8a3a5672652709af8851fa241..e59e14aba6e92c4625896e24c6a20f015d38932e 100644 (file)
--- a/src/allmydata/test/test_util.py
+++ b/src/allmydata/test/test_util.py
@@ -1010,9 +1010,10 @@ class TimeFormat(unittest.TestCase, TimezoneMixin):
     def test_format_time_y2038(self):
         seconds_per_day = 60*60*24
         leap_years_1970_to_2047_inclusive = ((2044 - 1968) // 4)
-        self.failUnlessEqual(time_format.format_time(time.gmtime(seconds_per_day*((2048 - 1970)*365+leap_years_1970_to_2047_inclusive))), '2048-01-01 00:00:00')
-
-    test_format_time_y2038.todo = "This test is known to fail on systems with 32-bit time_t."
+        try:
+            self.failUnlessEqual(time_format.format_time(time.gmtime(seconds_per_day*((2048 - 1970)*365+leap_years_1970_to_2047_inclusive))), '2048-01-01 00:00:00')
+        except unittest.FailTest:
+            raise unittest.SkipTest("Note: this system cannot handle dates after 2037.")
 
     def test_format_delta(self):
         time_1 = 1389812723