← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_remember_option.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remember_option.py
1
 
# Copyright (C) 2011 Canonical Ltd
 
1
# Copyright (C) 2011, 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
117
117
        else:
118
118
            expected_submit_branch, expected_public_branch = expected_locations
119
119
        br, _ = branch.Branch.open_containing(self.working_dir)
120
 
        self.assertEquals(expected_submit_branch, br.get_submit_branch())
121
 
        self.assertEquals(expected_public_branch, br.get_public_branch())
 
120
        self.assertEqual(expected_submit_branch, br.get_submit_branch())
 
121
        self.assertEqual(expected_public_branch, br.get_public_branch())
122
122
 
123
123
 
124
124
class TestPushRemember(script.TestCaseWithTransportAndScript,
156
156
    def assertLocations(self, expected_locations):
157
157
        br, _ = branch.Branch.open_containing(self.working_dir)
158
158
        if not expected_locations:
159
 
            self.assertEquals(None, br.get_push_location())
 
159
            self.assertEqual(None, br.get_push_location())
160
160
        else:
161
161
            expected_push_location = expected_locations[0]
162
162
            push_location = urlutils.relative_url(br.base,
201
201
    def assertLocations(self, expected_locations):
202
202
        br, _ = branch.Branch.open_containing(self.working_dir)
203
203
        if not expected_locations:
204
 
            self.assertEquals(None, br.get_parent())
 
204
            self.assertEqual(None, br.get_parent())
205
205
        else:
206
206
            expected_pull_location = expected_locations[0]
207
207
            pull_location = urlutils.relative_url(br.base, br.get_parent())