← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interbranch/__init__.py

  • Committer: Vincent Ladeuil
  • Date: 2016-02-01 18:09:18 UTC
  • mfrom: (6614.1.3 assert)
  • mto: This revision was merged to the branch mainline in revision 6615.
  • Revision ID: v.ladeuil+lp@free.fr-20160201180918-jqtq8ol6gdbbbtpv
Fix deprecated assertions to unblock release

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/__init__.py
1
 
# Copyright (C) 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2009, 2010, 2011, 2016 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
80
80
 
81
81
    def make_from_branch_and_memory_tree(self, relpath):
82
82
        """Create a branch on the default transport and a MemoryTree for it."""
83
 
        self.assertEquals(
 
83
        self.assertEqual(
84
84
            self.branch_format_from._matchingbzrdir.get_branch_format(),
85
85
            self.branch_format_from)
86
86
        return self.make_branch_and_memory_tree(
88
88
 
89
89
    def make_from_branch_and_tree(self, relpath):
90
90
        """Create a branch on the default transport and a working tree for it."""
91
 
        self.assertEquals(
 
91
        self.assertEqual(
92
92
            self.branch_format_from._matchingbzrdir.get_branch_format(),
93
93
            self.branch_format_from)
94
94
        return self.make_branch_and_tree(relpath,
95
95
            format=self.branch_format_from._matchingbzrdir)
96
96
 
97
97
    def make_from_branch_builder(self, relpath):
98
 
        self.assertEquals(
 
98
        self.assertEqual(
99
99
            self.branch_format_from._matchingbzrdir.get_branch_format(),
100
100
            self.branch_format_from)
101
101
        return branchbuilder.BranchBuilder(self.get_transport(relpath),
102
102
            format=self.branch_format_from._matchingbzrdir)
103
103
 
104
104
    def make_to_branch(self, relpath):
105
 
        self.assertEquals(
 
105
        self.assertEqual(
106
106
            self.branch_format_to._matchingbzrdir.get_branch_format(),
107
107
            self.branch_format_to)
108
108
        return self.make_branch(relpath, format=self.branch_format_to._matchingbzrdir)
109
109
 
110
110
    def make_to_branch_and_memory_tree(self, relpath):
111
111
        """Create a branch on the default transport and a MemoryTree for it."""
112
 
        self.assertEquals(
 
112
        self.assertEqual(
113
113
            self.branch_format_to._matchingbzrdir.get_branch_format(),
114
114
            self.branch_format_to)
115
115
        return self.make_branch_and_memory_tree(
117
117
 
118
118
    def make_to_branch_and_tree(self, relpath):
119
119
        """Create a branch on the default transport and a working tree for it."""
120
 
        self.assertEquals(
 
120
        self.assertEqual(
121
121
            self.branch_format_to._matchingbzrdir.get_branch_format(),
122
122
            self.branch_format_to)
123
123
        return self.make_branch_and_tree(relpath,
140
140
    def sprout_to(self, origdir, to_url):
141
141
        """Sprout a bzrdir, using to_format for the new branch."""
142
142
        wt = self._sprout(origdir, to_url, self.branch_format_to._matchingbzrdir)
143
 
        self.assertEquals(wt.branch._format, self.branch_format_to)
 
143
        self.assertEqual(wt.branch._format, self.branch_format_to)
144
144
        return wt.bzrdir
145
145
 
146
146
    def sprout_from(self, origdir, to_url):
147
147
        """Sprout a bzrdir, using from_format for the new bzrdir."""
148
148
        wt = self._sprout(origdir, to_url,
149
149
            self.branch_format_from._matchingbzrdir)
150
 
        self.assertEquals(wt.branch._format, self.branch_format_from)
 
150
        self.assertEqual(wt.branch._format, self.branch_format_from)
151
151
        return wt.bzrdir
152
152
 
153
153