← 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-06-18 11:43:07 UTC
  • mfrom: (6437.54.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6525.
  • Revision ID: jelmer@samba.org-20120618114307-zeazlym311p38m98
Merge 2.5.

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
 
97
104
    def test_add_in_versioned(self):
98
105
        """Try to add a file in a versioned directory.
99
106
 
109
116
 
110
117
    def test_subdir_add(self):
111
118
        """Add in subdirectory should add only things from there down"""
112
 
        from bzrlib.workingtree import WorkingTree
113
 
 
114
119
        eq = self.assertEqual
115
120
        ass = self.assertTrue
116
121