← 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: Patch Queue Manager
  • Date: 2013-05-20 17:46:29 UTC
  • mfrom: (6573.1.1 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20130520174629-dp7zujtuclvomuzd
(jameinel) Fix CVE 2013-2009. Avoid allowing multiple wildcards in a single
 SSL cert hostname segment. (Andrew Starr-Bochicchio)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
1
 
# Copyright (C) 2006, 2007, 2009, 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009-2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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
 
154
159
        new_tree = self.make_branch_and_tree('new')
155
160
        self.build_tree(['new/a', 'new/b/', 'new/b/c', 'd'])
156
161
 
157
 
        os.chdir('new')
158
 
        out, err = self.run_bzr('add --file-ids-from ../base')
 
162
        out, err = self.run_bzr('add --file-ids-from ../base',
 
163
                                working_dir='new')
159
164
        self.assertEqual('', err)
160
165
        self.assertEqualDiff('adding a w/ file id from a\n'
161
166
                             'adding b w/ file id from b\n'
175
180
        new_tree = self.make_branch_and_tree('new')
176
181
        self.build_tree(['new/c', 'new/d'])
177
182
 
178
 
        os.chdir('new')
179
 
        out, err = self.run_bzr('add --file-ids-from ../base/b')
 
183
        out, err = self.run_bzr('add --file-ids-from ../base/b',
 
184
                                working_dir='new')
180
185
        self.assertEqual('', err)
181
186
        self.assertEqualDiff('adding c w/ file id from b/c\n'
182
187
                             'adding d w/ file id from b/d\n',
183
188
                             out)
184
189
 
185
 
        new_tree = new_tree.bzrdir.open_workingtree()
 
190
        new_tree = new_tree.bzrdir.open_workingtree('new')
186
191
        self.assertEqual(base_tree.path2id('b/c'), new_tree.path2id('c'))
187
192
        self.assertEqual(base_tree.path2id('b/d'), new_tree.path2id('d'))
188
193
 
239
244
        out, err = self.run_bzr(["add", "a", "b"], working_dir=u"\xA7")
240
245
        self.assertEquals(out, "adding a\n" "adding b\n")
241
246
        self.assertEquals(err, "")
242
 
        
 
247
 
243
248
    def test_add_skip_large_files(self):
244
249
        """Test skipping files larger than add.maximum_file_size"""
245
250
        tree = self.make_branch_and_tree('.')
247
252
        self.build_tree_contents([('small.txt', '0\n')])
248
253
        self.build_tree_contents([('big.txt', '01234567890123456789\n')])
249
254
        self.build_tree_contents([('big2.txt', '01234567890123456789\n')])
250
 
        tree.branch.get_config().set_user_option('add.maximum_file_size', 5)
 
255
        tree.branch.get_config_stack().set('add.maximum_file_size', 5)
251
256
        out = self.run_bzr('add')[0]
252
257
        results = sorted(out.rstrip('\n').split('\n'))
253
 
        self.assertEquals(['adding small.txt'], 
254
 
                          results)
 
258
        self.assertEquals(['adding small.txt'], results)
255
259
        # named items never skipped, even if over max
256
260
        out, err = self.run_bzr(["add", "big2.txt"])
257
261
        results = sorted(out.rstrip('\n').split('\n'))
258
 
        self.assertEquals(['adding big2.txt'], 
259
 
                          results)
260
 
        self.assertEquals(err, "")
261
 
        tree.branch.get_config().set_user_option('add.maximum_file_size', 30)
 
262
        self.assertEquals(['adding big2.txt'], results)
 
263
        self.assertEquals("", err)
 
264
        tree.branch.get_config_stack().set('add.maximum_file_size', 30)
262
265
        out = self.run_bzr('add')[0]
263
266
        results = sorted(out.rstrip('\n').split('\n'))
264
 
        self.assertEquals(['adding big.txt'], 
265
 
                          results)
 
267
        self.assertEquals(['adding big.txt'], results)