← 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: Andrew Bennetts
  • Date: 2010-04-14 06:47:18 UTC
  • mto: This revision was merged to the branch mainline in revision 5155.
  • Revision ID: andrew.bennetts@canonical.com-20100414064718-130ptdug4opfjj6b
Link to Python bug in comment.

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
 
    )
29
26
 
30
27
 
31
28
def load_tests(standard_tests, module, loader):
220
217
        os.symlink(osutils.abspath('target'), 'tree/link')
221
218
        out = self.run_bzr(['add', 'tree/link'])[0]
222
219
        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
 
        ''')