← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bad_files.py

  • Committer: Martin Packman
  • Date: 2011-12-23 19:38:22 UTC
  • mto: This revision was merged to the branch mainline in revision 6405.
  • Revision ID: martin.packman@canonical.com-20111223193822-hesheea4o8aqwexv
Accept and document passing the medium rather than transport for smart connections

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bad_files.py
1
 
# Copyright (C) 2005, 2007 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2011 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
"""Tests being able to ignore bad filetypes."""
21
21
import os
22
22
 
23
23
from bzrlib import (
24
 
    add,
25
24
    errors,
26
25
    )
27
26
from bzrlib.status import show_tree_status
28
27
from bzrlib.tests import TestCaseWithTransport
 
28
from bzrlib.tests.features import (
 
29
    OsFifoFeature,
 
30
    )
29
31
 
30
32
 
31
33
def verify_status(tester, tree, value):
40
42
 
41
43
    def test_bad_files(self):
42
44
        """Test that bzr will ignore files it doesn't like"""
43
 
        if getattr(os, 'mkfifo', None) is None:
44
 
            # TODO: Ultimately this should be TestSkipped
45
 
            # or PlatformDeficiency
46
 
            return
 
45
        self.requireFeature(OsFifoFeature)
47
46
 
48
47
        wt = self.make_branch_and_tree('.')
49
48
        b = wt.branch
70
69
                           ])
71
70
 
72
71
        # We should raise an error if we are adding a bogus file
73
 
        self.assertRaises(errors.BadFileKindError,
74
 
                          add.smart_add_tree, wt, ['a-fifo'])
 
72
        self.assertRaises(errors.BadFileKindError, wt.smart_add, ['a-fifo'])
75
73
 
76
74
        # And the list of files shouldn't have been modified
77
75
        verify_status(self, wt,
82
80
 
83
81
        # Make sure smart_add can handle having a bogus
84
82
        # file in the way
85
 
        add.smart_add_tree(wt, ['.'])
 
83
        wt.smart_add([])
86
84
        verify_status(self, wt,
87
85
                          ['added:\n',
88
86
                           '  six\n',