Merge lp:~mbp/launchpad/882324-mtime-test into lp:launchpad

[Martin Pool]

[r=lifeless][bug=882324] make testHomeDirectoryJob assertion more robust and fail more obviously

This tries to make the spurious test failure in bug 882324 either not happen, or at least fail in a more obvious way.

I can't reproduce it locally after several tries so I'm not sure this fixes it.

[Robert Collins (lifeless)]

That looks ok, though personally I would ditch the assertTrue for
assertThat(
    floor(os.path.getmtime(fname)), Or(LessThan(now), Equals(now)), "fname")

review: Approve

[Robert Collins (lifeless)]

erm, \o/ on typos. Obviously I meant:
assertThat(floor(os.path.getmtime(fname)), Not(LessThan(now)), "fname")

[Robert Collins (lifeless)]

and without the quotes.

=== modified file 'lib/canonical/launchpad/utilities/ftests/test_gpghandler.py'
--- lib/canonical/launchpad/utilities/ftests/test_gpghandler.py	2011-08-28 07:29:11 +0000
+++ lib/canonical/launchpad/utilities/ftests/test_gpghandler.py	2011-10-27 01:02:25 +0000
@@ -14,6 +14,11 @@
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
+from testtools.matchers import (
+    Not,
+    LessThan,
+    )
+
 from canonical.launchpad.ftests import (
     ANONYMOUS,
     keys_for_tests,
@@ -170,7 +175,9 @@
         now = floor(time())
         gpghandler.touchConfigurationDirectory()
         for fname in files_to_check:
-            self.assertTrue(now <= floor(os.path.getmtime(fname)))
+            file_time = os.path.getmtime(fname)
+            self.assertThat(
+                file_time, Not(LessThan(now)), fname)
 
     def test_retrieveKey_raises_GPGKeyDoesNotExistOnServer(self):
         # GPGHandler.retrieveKey() raises GPGKeyDoesNotExistOnServer