← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2010-07-16 13:53:26 UTC
  • mto: (5346.4.3 cleanup)
  • mto: This revision was merged to the branch mainline in revision 5350.
  • Revision ID: mbp@canonical.com-20100716135326-a3d5bh29w64ylh5p
* `PathNotChild` should not give a traceback.
  (Martin Pool, bug 98735)

* `FileInWrongBranch` is deprecated in favour of `PathNotChild` and no
  longer raised.
  (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
23
23
    osutils,
24
24
    tests,
25
25
    )
 
26
from bzrlib.tests import (
 
27
    script,
 
28
    )
26
29
 
27
30
 
28
31
def load_tests(standard_tests, module, loader):
217
220
        os.symlink(osutils.abspath('target'), 'tree/link')
218
221
        out = self.run_bzr(['add', 'tree/link'])[0]
219
222
        self.assertEquals(out, 'adding link\n')
 
223
 
 
224
    def test_add_not_child(self):
 
225
        # https://bugs.launchpad.net/bzr/+bug/98735
 
226
        sr = script.ScriptRunner()
 
227
        self.make_branch_and_tree('tree1')
 
228
        self.make_branch_and_tree('tree2')
 
229
        self.build_tree(['tree1/a', 'tree2/b'])
 
230
        sr.run_script(self, '''
 
231
        $ bzr add tree1/a tree2/b
 
232
        2>bzr: ERROR: Path "...tree2/b" is not a child of path "...tree1"
 
233
        ''')