← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_dirstate.py

  • Committer: Samuel Bronson
  • Date: 2012-08-30 20:36:18 UTC
  • mto: (6015.57.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: naesten@gmail.com-20120830203618-y2dzw91nqpvpgxvx
Update INSTALL for switch to Python 2.6 and up.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_dirstate.py
32
32
    workingtree_4,
33
33
    )
34
34
from bzrlib.transport import memory
35
 
from bzrlib.tests import (
36
 
    features,
37
 
    test_osutils,
38
 
    )
 
35
from bzrlib.tests import test_osutils
39
36
from bzrlib.tests.scenarios import load_tests_apply_scenarios
40
37
 
41
38
 
1212
1209
        # The most trivial addition of a symlink when there are no parents and
1213
1210
        # its in the root and all data about the file is supplied
1214
1211
        # bzr doesn't support fake symlinks on windows, yet.
1215
 
        self.requireFeature(features.SymlinkFeature)
 
1212
        self.requireFeature(tests.SymlinkFeature)
1216
1213
        os.symlink(target, link_name)
1217
1214
        stat = os.lstat(link_name)
1218
1215
        expected_entries = [
1243
1240
        self._test_add_symlink_to_root_no_parents_all_data('a link', 'target')
1244
1241
 
1245
1242
    def test_add_symlink_unicode_to_root_no_parents_all_data(self):
1246
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
1243
        self.requireFeature(tests.UnicodeFilenameFeature)
1247
1244
        self._test_add_symlink_to_root_no_parents_all_data(
1248
1245
            u'\N{Euro Sign}link', u'targ\N{Euro Sign}et')
1249
1246
 
2210
2207
class TestDirstateTreeReference(TestCaseWithDirState):
2211
2208
 
2212
2209
    def test_reference_revision_is_none(self):
2213
 
        tree = self.make_branch_and_tree('tree', format='development-subtree')
 
2210
        tree = self.make_branch_and_tree('tree', format='dirstate-with-subtree')
2214
2211
        subtree = self.make_branch_and_tree('tree/subtree',
2215
 
                            format='development-subtree')
 
2212
                            format='dirstate-with-subtree')
2216
2213
        subtree.set_root_id('subtree')
2217
2214
        tree.add_reference(subtree)
2218
2215
        tree.add('subtree')
2529
2526
        state = self.create_empty_dirstate()
2530
2527
        state.set_state_from_scratch(active_tree.inventory,
2531
2528
            [('basis', basis_tree)], [])
2532
 
        delta = target_tree.inventory._make_delta(
2533
 
            basis_tree.inventory)
 
2529
        delta = target_tree.inventory._make_delta(basis_tree.inventory)
2534
2530
        state.update_basis_by_delta(delta, 'target')
2535
2531
        state._validate()
2536
2532
        dirstate_tree = workingtree_4.DirStateRevisionTree(state,