← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_executable.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/per_workingtree/test_executable.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009, 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
147
147
 
148
148
        # Make sure pull will delete the files
149
149
        wt2.pull(self.wt.branch)
150
 
        self.assertEquals(['r2'], wt2.get_parent_ids())
151
 
        self.assertEquals('r2', wt2.branch.last_revision())
 
150
        self.assertEqual(['r2'], wt2.get_parent_ids())
 
151
        self.assertEqual('r2', wt2.branch.last_revision())
152
152
        self.check_empty(wt2)
153
153
 
154
154
        # Now restore the files on the first branch and commit
161
161
        self.check_exist(self.wt)
162
162
 
163
163
        wt2.pull(self.wt.branch)
164
 
        self.assertEquals(['r3'], wt2.get_parent_ids())
165
 
        self.assertEquals('r3', wt2.branch.last_revision())
 
164
        self.assertEqual(['r3'], wt2.get_parent_ids())
 
165
        self.assertEqual('r3', wt2.branch.last_revision())
166
166
        self.check_exist(wt2)
167
167
 
168
168
    def test_08_no_op_revert(self):