← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2010-04-28 07:53:34 UTC
  • mto: This revision was merged to the branch mainline in revision 5192.
  • Revision ID: mbp@sourcefrog.net-20100428075334-mbrtapod09d7v6ea
https://launchpad.net/bugs/491763
wrap os.rename to insert the source and destination filenames in any exception that may be raised

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_join.py
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2010 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
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib import bzrdir, repository, tests, workingtree
 
20
from bzrlib import (
 
21
    bzrdir,
 
22
    osutils,
 
23
    repository,
 
24
    tests,
 
25
    workingtree,
 
26
    )
21
27
 
22
28
 
23
29
class TestJoin(tests.TestCaseWithTransport):
50
56
    def test_join_error(self):
51
57
        base_tree, sub_tree = self.make_trees()
52
58
        os.mkdir('tree/subtree2')
53
 
        os.rename('tree/subtree', 'tree/subtree2/subtree')
 
59
        osutils.rename('tree/subtree', 'tree/subtree2/subtree')
54
60
        self.run_bzr_error(
55
61
            ('Cannot join .*subtree.  Parent directory is not versioned',),
56
62
             'join tree/subtree2/subtree')