← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_smart_add.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_smart_add.py
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2010 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
17
17
"""Test that we can use smart_add on all Tree implementations."""
18
18
 
19
19
from cStringIO import StringIO
 
20
import sys
20
21
 
21
22
from bzrlib import (
22
23
    add,
53
54
 
54
55
    def assertFilenameSkipped(self, filename):
55
56
        tree = self.make_branch_and_tree('tree')
56
 
        self.build_tree(['tree/'+filename])
 
57
        try:
 
58
            self.build_tree(['tree/'+filename])
 
59
        except errors.NoSuchFile:
 
60
            if sys.platform == 'win32':
 
61
                raise tests.TestNotApplicable('Cannot create files named %r on'
 
62
                    ' win32' % (filename,))
57
63
        tree.smart_add(['tree'])
58
64
        self.assertEqual(None, tree.path2id(filename))
59
65