Merge lp:~mwhudson/launchpad/testtools into lp:launchpad

[Michael Hudson-Doyle]

[r=lifeless][ui=none][no-qa] Remove StartsWith matcher from lp.testing.matchers in favour of one from testtools & fix some assertions that always passed.

I fixed some fallout from the prerequisite branch.

[Robert Collins (lifeless)]

review: Approve

=== modified file 'lib/canonical/launchpad/ftests/test_wadl_generation.py'
--- lib/canonical/launchpad/ftests/test_wadl_generation.py	2010-10-01 19:30:55 +0000
+++ lib/canonical/launchpad/ftests/test_wadl_generation.py	2010-11-12 00:45:16 +0000
@@ -10,6 +10,8 @@
 import subprocess
 import tempfile
 
+from testtools.matchers import StartsWith
+
 from zope.component import getUtility
 
 from canonical.launchpad.rest.wadl import generate_wadl, generate_html
@@ -17,10 +19,7 @@
 from canonical.testing import LaunchpadFunctionalLayer
 from lazr.restful.interfaces import IWebServiceConfiguration
 from lp.testing import TestCase
-from lp.testing.matchers import (
-    Contains,
-    StartsWith,
-    )
+from lp.testing.matchers import Contains
 
 
 class SmokeTestWadlAndDocGeneration(TestCase):

=== modified file 'lib/lp/bugs/model/tests/test_bug.py'
--- lib/lp/bugs/model/tests/test_bug.py	2010-11-12 00:45:09 +0000
+++ lib/lp/bugs/model/tests/test_bug.py	2010-10-26 15:47:24 +0000
@@ -3,12 +3,6 @@
 
 __metaclass__ = type
 
-<<<<<<< TREE
-=======
-from storm.store import ResultSet
-from testtools.matchers import StartsWith
-
->>>>>>> MERGE-SOURCE
 from canonical.testing.layers import DatabaseFunctionalLayer
 from lp.registry.enum import BugNotificationLevel
 from lp.registry.interfaces.person import PersonVisibility

=== modified file 'lib/lp/code/model/branchjob.py'
--- lib/lp/code/model/branchjob.py	2010-11-07 12:17:44 +0000
+++ lib/lp/code/model/branchjob.py	2010-11-12 00:45:16 +0000
@@ -54,6 +54,7 @@
     classProvides,
     implements,
     )
+from zope.security.proxy import removeSecurityProxy
 
 from canonical.config import config
 from canonical.database.enumcol import EnumCol

=== modified file 'lib/lp/code/model/tests/test_branchpuller.py'
--- lib/lp/code/model/tests/test_branchpuller.py	2010-11-08 13:50:40 +0000
+++ lib/lp/code/model/tests/test_branchpuller.py	2010-11-12 00:45:16 +0000
@@ -61,7 +61,7 @@
         """requestMirror sets the mirror request time to 'now'."""
         branch = self.makeAnyBranch()
         branch.requestMirror()
-        self.assertEqual(branch.next_mirror_time, UTC_NOW)
+        self.assertSqlAttributeEqualsDate(branch, 'next_mirror_time', UTC_NOW)
 
     def test_requestMirror_doesnt_demote_branch(self):
         # requestMirror() sets the mirror request time to 'now' unless
@@ -78,10 +78,10 @@
         # requestMirror() sets the mirror request time to 'now' if
         # next_mirror_time is set and in the future.
         branch = self.makeAnyBranch()
-        future_time = datetime.now(pytz.UTC) - timedelta(days=1)
+        future_time = datetime.now(pytz.UTC) + timedelta(days=1)
         removeSecurityProxy(branch).next_mirror_time = future_time
         branch.requestMirror()
-        self.assertEqual(branch.next_mirror_time, UTC_NOW)
+        self.assertSqlAttributeEqualsDate(branch, 'next_mirror_time', UTC_NOW)
 
     def test_mirroringResetsMirrorRequest(self):
         """Mirroring branches resets their mirror request times."""

=== modified file 'lib/lp/testing/matchers.py'
--- lib/lp/testing/matchers.py	2010-11-12 00:45:09 +0000
+++ lib/lp/testing/matchers.py	2010-11-12 00:45:16 +0000
@@ -189,43 +189,6 @@
         return IsProxied().match(matchee)
 
 
-<<<<<<< TREE
-class DoesNotStartWith(Mismatch):
-
-    def __init__(self, matchee, expected):
-        """Create a DoesNotStartWith Mismatch.
-
-        :param matchee: the string that did not match.
-        :param expected: the string that `matchee` was expected to start
-            with.
-        """
-        self.matchee = matchee
-        self.expected = expected
-
-    def describe(self):
-        return "'%s' does not start with '%s'." % (
-            self.matchee, self.expected)
-
-
-class StartsWith(Matcher):
-    """Checks whether one string starts with another."""
-
-    def __init__(self, expected):
-        """Create a StartsWith Matcher.
-
-        :param expected: the string that matchees should start with.
-        """
-        self.expected = expected
-
-    def __str__(self):
-        return "Starts with '%s'." % self.expected
-
-    def match(self, matchee):
-        if not matchee.startswith(self.expected):
-            return DoesNotStartWith(matchee, self.expected)
-        return None
-
-
 class DoesNotContain(Mismatch):
 
     def __init__(self, matchee, expected):
@@ -261,8 +224,6 @@
         return None
 
 
-=======
->>>>>>> MERGE-SOURCE
 class IsConfiguredBatchNavigator(Matcher):
     """Check that an object is a batch navigator."""
 

=== modified file 'lib/lp/testing/tests/test_matchers.py'
--- lib/lp/testing/tests/test_matchers.py	2010-11-12 00:45:09 +0000
+++ lib/lp/testing/tests/test_matchers.py	2010-11-12 00:45:16 +0000
@@ -224,40 +224,6 @@
         self.assertEqual(
             "queries do not match: %s" % (LessThan(2).match(2).describe(),),
             mismatch.describe())
-<<<<<<< TREE
-
-
-class DoesNotStartWithTests(TestCase):
-
-    def test_describe(self):
-        mismatch = DoesNotStartWith("foo", "bar")
-        self.assertEqual(
-            "'foo' does not start with 'bar'.", mismatch.describe())
-
-
-class StartsWithTests(TestCase):
-
-    def test_str(self):
-        matcher = StartsWith("bar")
-        self.assertEqual("Starts with 'bar'.", str(matcher))
-
-    def test_match(self):
-        matcher = StartsWith("bar")
-        self.assertIs(None, matcher.match("barf"))
-
-    def test_mismatch_returns_does_not_start_with(self):
-        matcher = StartsWith("bar")
-        self.assertIsInstance(matcher.match("foo"), DoesNotStartWith)
-
-    def test_mismatch_sets_matchee(self):
-        matcher = StartsWith("bar")
-        mismatch = matcher.match("foo")
-        self.assertEqual("foo", mismatch.matchee)
-
-    def test_mismatch_sets_expected(self):
-        matcher = StartsWith("bar")
-        mismatch = matcher.match("foo")
-        self.assertEqual("bar", mismatch.expected)
 
 
 class DoesNotContainTests(TestCase):
@@ -291,5 +257,3 @@
         matcher = Contains("bar")
         mismatch = matcher.match("foo")
         self.assertEqual("bar", mismatch.expected)
-=======
->>>>>>> MERGE-SOURCE

=== modified file 'versions.cfg'
--- versions.cfg	2010-11-12 00:45:09 +0000
+++ versions.cfg	2010-11-11 02:23:21 +0000
@@ -62,16 +62,8 @@
 simplesettings = 0.4
 SimpleTal = 4.1
 sourcecodegen = 0.6.9
-<<<<<<< TREE
 storm = 0.18
 testtools = 0.9.8-r128
-=======
-# lp:~gary/storm/0.17-launchpad has the branch for this distribution.  It is
-# 0.17 plus r374 from storm trunk for fixing lp:620508 (in order to address
-# lp:627442).
-storm = 0.17-launchpad-1
-testtools = 0.9.7
->>>>>>> MERGE-SOURCE
 transaction = 1.0.0
 Twisted = 10.1.0
 uuid = 1.30