~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-03-06 03:02:19 UTC
  • mfrom: (4083.1.7 robert-rollup)
  • Revision ID: pqm@pqm.ubuntu.com-20090306030219-enauehb3achqqq7c
(robertc) Reduce noise from 'add';
        register factories not instances for network_names;
        add Branch.get_parent RPC.

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
        results = sorted(out.rstrip('\n').split('\n'))
36
36
        self.assertEquals(['If you wish to add some of these files, please'\
37
37
                           ' add them by name.',
38
 
                           'add completed',
39
38
                           'adding .bzrignore',
40
39
                           'adding dir',
41
40
                           'adding dir/sub.txt',
149
148
        self.assertEqual('', err)
150
149
        self.assertEqualDiff('adding a w/ file id from a\n'
151
150
                             'adding b w/ file id from b\n'
152
 
                             'adding b/c w/ file id from b/c\n'
153
 
                             'add completed\n',
 
151
                             'adding b/c w/ file id from b/c\n',
154
152
                             out)
155
153
        new_tree = new_tree.bzrdir.open_workingtree()
156
154
        self.assertEqual(base_tree.path2id('a'), new_tree.path2id('a'))
170
168
        out, err = self.run_bzr('add --file-ids-from ../base/b')
171
169
        self.assertEqual('', err)
172
170
        self.assertEqualDiff('adding c w/ file id from b/c\n'
173
 
                             'adding d w/ file id from b/d\n'
174
 
                             'add completed\n',
 
171
                             'adding d w/ file id from b/d\n',
175
172
                             out)
176
173
 
177
174
        new_tree = new_tree.bzrdir.open_workingtree()