← 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: Jelmer Vernooij
  • Date: 2012-01-27 18:41:20 UTC
  • mto: This revision was merged to the branch mainline in revision 6449.
  • Revision ID: jelmer@samba.org-20120127184120-osvbbiwijy58hsah
remove unnecessary code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
94
94
        self.run_bzr('add inertiatic/../cicatriz/esp')
95
95
        self.assertEquals(self.run_bzr('unknowns')[0], '')
96
96
 
97
 
    def test_add_no_recurse(self):
98
 
        tree = self.make_branch_and_tree('.')
99
 
        self.build_tree(['inertiatic/', 'inertiatic/esp'])
100
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic\n')
101
 
        self.run_bzr('add -N inertiatic')
102
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'inertiatic/esp\n')
103
 
 
104
97
    def test_add_in_versioned(self):
105
98
        """Try to add a file in a versioned directory.
106
99
 
116
109
 
117
110
    def test_subdir_add(self):
118
111
        """Add in subdirectory should add only things from there down"""
 
112
        from bzrlib.workingtree import WorkingTree
 
113
 
119
114
        eq = self.assertEqual
120
115
        ass = self.assertTrue
121
116
 
252
247
        self.build_tree_contents([('small.txt', '0\n')])
253
248
        self.build_tree_contents([('big.txt', '01234567890123456789\n')])
254
249
        self.build_tree_contents([('big2.txt', '01234567890123456789\n')])
255
 
        tree.branch.get_config_stack().set('add.maximum_file_size', 5)
 
250
        tree.branch.get_config().set_user_option('add.maximum_file_size', 5)
256
251
        out = self.run_bzr('add')[0]
257
252
        results = sorted(out.rstrip('\n').split('\n'))
258
253
        self.assertEquals(['adding small.txt'], results)