← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_matchers.py

  • Committer: Patch Queue Manager
  • Date: 2016-02-01 19:13:13 UTC
  • mfrom: (6614.2.2 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20160201191313-wdfvmfff1djde6oq
(vila) Release 2.7.0 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_matchers.py
1
 
# Copyright (C) 2010 Canonical Ltd
 
1
# Copyright (C) 2010, 2011, 2012, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
103
103
        m = MatchesAncestry(branch.repository, revid1)
104
104
        mismatch = m.match([])
105
105
        self.assertIsNot(None, mismatch)
106
 
        self.assertEquals(
 
106
        self.assertEqual(
107
107
            "mismatched ancestry for revision '%s' was ['%s'], expected []" % (
108
108
                revid1, revid1),
109
109
            mismatch.describe())
132
132
        t.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
133
133
        mismatch = HasLayout(['a']).match(t)
134
134
        self.assertIsNot(None, mismatch)
135
 
        self.assertEquals(
 
135
        self.assertEqual(
136
136
            "['a'] != [u'', u'a', u'b/', u'b/c']",
137
137
            mismatch.describe())
138
138
 
146
146
        self.assertIs(None, HasLayout(['', 'a', 'b/', 'b/c', 'd/']).match(t))
147
147
        mismatch = HasLayout([u'', u'a', u'd/']).match(t)
148
148
        self.assertIsNot(None, mismatch)
149
 
        self.assertEquals(
 
149
        self.assertEqual(
150
150
            "[u'', u'a'] != [u'', u'a', u'b/', u'b/c']",
151
151
            mismatch.describe())
152
152
 
175
175
                 self._make_call("Branch.get_config_file", [])]
176
176
        mismatch = ContainsNoVfsCalls().match(calls)
177
177
        self.assertIsNot(None, mismatch)
178
 
        self.assertEquals([calls[0].call], mismatch.vfs_calls)
179
 
        self.assertEquals("no VFS calls expected, got: append('file')""",
 
178
        self.assertEqual([calls[0].call], mismatch.vfs_calls)
 
179
        self.assertEqual("no VFS calls expected, got: append('file')""",
180
180
                mismatch.describe())
181
181
 
182
182
 
199
199
        tree.commit('msg1', rev_id='a')
200
200
        tree.commit('msg2', rev_id='b')
201
201
        matcher = RevisionHistoryMatches(['a', 'b', 'c'])
202
 
        self.assertEquals(
 
202
        self.assertEqual(
203
203
            "['a', 'b', 'c'] != ['a', 'b']",
204
204
            matcher.match(tree.branch).describe())