~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Martin Pool
  • Date: 2010-07-17 17:28:48 UTC
  • mto: (4634.158.4 2.0)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: mbp@canonical.com-20100717172848-vd73lksfvhp0gi1k
The test now actually passes on all wt formats

Show diffs side-by-side

added added

removed removed

Lines of Context:
60
60
 
61
61
    _test_needs_features = [tests.SymlinkFeature]
62
62
 
63
 
    def test_symlink_to_dir(self):
 
63
    def test_symlink_changes_to_dir(self):
64
64
        # <https://bugs.launchpad.net/bzr/+bug/192859>:
65
65
        # we had some past problems with the workingtree remembering for too
66
66
        # long what kind of object was at a particular name; we really
67
67
        # shouldn't do that.  Operating on the dirstate through passing
68
68
        # inventory deltas rather than mutating the inventory largely avoids
69
69
        # that.
70
 
        if self.workingtree_format.upgrade_recommended: 
71
 
            # File "bzrlib/workingtree.py", line 2341, in conflicts
72
 
            #   for conflicted in self._iter_conflicts():
73
 
            # File "bzrlib/workingtree.py", line 1590, in _iter_conflicts
74
 
            #   for info in self.list_files():
75
 
            # File "bzrlib/workingtree.py", line 1203, in list_files
76
 
            #   f_ie = inv.get_child(from_dir_id, f)
77
 
            # File "bzrlib/inventory.py", line 1269, in get_child
78
 
            #   return self[parent_id].children.get(filename)
79
 
            # AttributeError: children
80
 
            raise tests.TestSkipped("known broken on pre-dirstate formats; wontfix")
81
70
        tree = self.make_branch_and_tree('tree')
82
71
        self.build_tree_contents([
83
72
            ('tree/a@', 'target')])