← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Patch Queue Manager
  • Date: 2012-01-05 17:46:44 UTC
  • mfrom: (6423.1.1 os-chdir-is-bad)
  • Revision ID: pqm@pqm.ubuntu.com-20120105174644-3in053mac5now0up
(vila) Cleanup some blackbox tests from obsolete idioms. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge_directive.py
1
 
# Copyright (C) 2007, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2007, 2009-2012 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
234
234
        foo = self.make_branch_and_tree('foo')
235
235
        foo.commit('rev1')
236
236
        bar = self.make_branch_and_tree('bar')
237
 
        os.chdir('foo')
238
 
        self.run_bzr('merge-directive ../bar')
 
237
        self.run_bzr('merge-directive ../bar', working_dir='foo')
239
238
 
240
239
    def test_no_commits(self):
241
240
        foo = self.make_branch_and_tree('foo')
242
241
        bar = self.make_branch_and_tree('bar')
243
 
        os.chdir('foo')
244
242
        self.run_bzr_error(('No revisions to bundle.', ),
245
 
                            'merge-directive ../bar')
 
243
                            'merge-directive ../bar', working_dir='foo')
246
244
 
247
245
    def test_encoding_exact(self):
248
246
        tree1, tree2 = self.prepare_merge_directive()