← Back to branch summary

~toddy/bzr/bzr.i18n

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/test_inv.py

  • Committer: Tobias Toedter
  • Date: 2007-12-30 18:52:13 UTC
  • mfrom: (2438.1.708 +trunk)
  • Revision ID: t.toedter@gmx.net-20071230185213-7xiqpbtshmnsf073
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_inv.py
23
23
from bzrlib.diff import internal_diff
24
24
from bzrlib.mutabletree import MutableTree
25
25
from bzrlib.osutils import has_symlinks
26
 
from bzrlib.symbol_versioning import zero_ninetyone, zero_ninetythree
 
26
from bzrlib.symbol_versioning import zero_ninetyone, one_zero
27
27
from bzrlib.tests import SymlinkFeature, TestSkipped
28
28
from bzrlib.tests.tree_implementations import TestCaseWithTree
29
29
from bzrlib.uncommit import uncommit
64
64
 
65
65
    def test_file_diff_deleted(self):
66
66
        output = StringIO()
67
 
        self.applyDeprecated(zero_ninetythree,
 
67
        self.applyDeprecated(one_zero,
68
68
                             self.file_1.diff,
69
69
                             internal_diff,
70
70
                             "old_label", self.tree_1,
78
78
 
79
79
    def test_file_diff_added(self):
80
80
        output = StringIO()
81
 
        self.applyDeprecated(zero_ninetythree,
 
81
        self.applyDeprecated(one_zero,
82
82
                             self.file_1.diff,
83
83
                             internal_diff,
84
84
                             "new_label", self.tree_1,
92
92
 
93
93
    def test_file_diff_changed(self):
94
94
        output = StringIO()
95
 
        self.applyDeprecated(zero_ninetythree,
 
95
        self.applyDeprecated(one_zero,
96
96
                             self.file_1.diff,
97
97
                             internal_diff,
98
98
                             "/dev/null", self.tree_1,
107
107
        
108
108
    def test_file_diff_binary(self):
109
109
        output = StringIO()
110
 
        self.applyDeprecated(zero_ninetythree,
 
110
        self.applyDeprecated(one_zero,
111
111
                             self.file_1.diff,
112
112
                             internal_diff,
113
113
                             "/dev/null", self.tree_1,
119
119
    def test_link_diff_deleted(self):
120
120
        self.requireFeature(SymlinkFeature)
121
121
        output = StringIO()
122
 
        self.applyDeprecated(zero_ninetythree,
 
122
        self.applyDeprecated(one_zero,
123
123
                             self.link_1.diff,
124
124
                             internal_diff, "old_label",
125
125
                             self.tree_1, "/dev/null", None, None,
130
130
    def test_link_diff_added(self):
131
131
        self.requireFeature(SymlinkFeature)
132
132
        output = StringIO()
133
 
        self.applyDeprecated(zero_ninetythree,
 
133
        self.applyDeprecated(one_zero,
134
134
                             self.link_1.diff,
135
135
                             internal_diff,
136
136
                             "new_label", self.tree_1,
142
142
    def test_link_diff_changed(self):
143
143
        self.requireFeature(SymlinkFeature)
144
144
        output = StringIO()
145
 
        self.applyDeprecated(zero_ninetythree,
 
145
        self.applyDeprecated(one_zero,
146
146
                             self.link_1.diff,
147
147
                             internal_diff,
148
148
                             "/dev/null", self.tree_1,