← 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: Canonical.com Patch Queue Manager
  • Date: 2010-02-11 04:02:41 UTC
  • mfrom: (5017.2.2 tariff)
  • Revision ID: pqm@pqm.ubuntu.com-20100211040241-w6n021dz0uus341n
(mbp) add import-tariff tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_dirstate.py
1
 
# Copyright (C) 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-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
64
64
    def setUp(self):
65
65
        tests.TestCaseWithTransport.setUp(self)
66
66
 
67
 
        # Save platform specific info and reset it
68
 
        cur_dir_reader = osutils._selected_dir_reader
69
 
 
70
 
        def restore():
71
 
            osutils._selected_dir_reader = cur_dir_reader
72
 
        self.addCleanup(restore)
73
 
 
74
 
        osutils._selected_dir_reader = self._dir_reader_class()
 
67
        self.overrideAttr(osutils,
 
68
                          '_selected_dir_reader', self._dir_reader_class())
75
69
 
76
70
    def create_empty_dirstate(self):
77
71
        """Return a locked but empty dirstate"""
419
413
            (('', '', tree.get_root_id()), # common details
420
414
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
421
415
              ('d', '', 0, False, rev_id), # first parent details
422
 
              ('d', '', 0, False, rev_id2), # second parent details
 
416
              ('d', '', 0, False, rev_id), # second parent details
423
417
             ])])
424
418
        state = dirstate.DirState.from_tree(tree, 'dirstate')
425
419
        self.check_state_with_reopen(expected_result, state)
500
494
            (('', '', tree.get_root_id()), # common details
501
495
             [('d', '', 0, False, dirstate.DirState.NULLSTAT), # current tree
502
496
              ('d', '', 0, False, rev_id), # first parent details
503
 
              ('d', '', 0, False, rev_id2), # second parent details
 
497
              ('d', '', 0, False, rev_id), # second parent details
504
498
             ]),
505
499
            (('', 'a file', 'a-file-id'), # common
506
500
             [('f', '', 0, False, dirstate.DirState.NULLSTAT), # current
873
867
        state = dirstate.DirState.initialize('dirstate')
874
868
        try:
875
869
            # check precondition to be sure the state does change appropriately.
876
 
            self.assertEqual(
877
 
                [(('', '', 'TREE_ROOT'), [('d', '', 0, False,
878
 
                   'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])],
879
 
                list(state._iter_entries()))
880
 
            state.set_path_id('', 'foobarbaz')
881
 
            expected_rows = [
882
 
                (('', '', 'foobarbaz'), [('d', '', 0, False,
883
 
                   'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx')])]
 
870
            root_entry = (('', '', 'TREE_ROOT'), [('d', '', 0, False, 'x'*32)])
 
871
            self.assertEqual([root_entry], list(state._iter_entries()))
 
872
            self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
 
873
            self.assertEqual(root_entry,
 
874
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
 
875
            self.assertEqual((None, None),
 
876
                             state._get_entry(0, fileid_utf8='second-root-id'))
 
877
            state.set_path_id('', 'second-root-id')
 
878
            new_root_entry = (('', '', 'second-root-id'),
 
879
                              [('d', '', 0, False, 'x'*32)])
 
880
            expected_rows = [new_root_entry]
884
881
            self.assertEqual(expected_rows, list(state._iter_entries()))
 
882
            self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
 
883
            self.assertEqual(new_root_entry, 
 
884
                             state._get_entry(0, fileid_utf8='second-root-id'))
 
885
            self.assertEqual((None, None),
 
886
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
885
887
            # should work across save too
886
888
            state.save()
887
889
        finally:
905
907
        state._validate()
906
908
        try:
907
909
            state.set_parent_trees([('parent-revid', rt)], ghosts=[])
908
 
            state.set_path_id('', 'foobarbaz')
 
910
            root_entry = (('', '', 'TREE_ROOT'),
 
911
                          [('d', '', 0, False, 'x'*32),
 
912
                           ('d', '', 0, False, 'parent-revid')])
 
913
            self.assertEqual(root_entry, state._get_entry(0, path_utf8=''))
 
914
            self.assertEqual(root_entry,
 
915
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
 
916
            self.assertEqual((None, None),
 
917
                             state._get_entry(0, fileid_utf8='Asecond-root-id'))
 
918
            state.set_path_id('', 'Asecond-root-id')
909
919
            state._validate()
910
920
            # now see that it is what we expected
911
 
            expected_rows = [
912
 
                (('', '', 'TREE_ROOT'),
913
 
                    [('a', '', 0, False, ''),
914
 
                     ('d', '', 0, False, 'parent-revid'),
915
 
                     ]),
916
 
                (('', '', 'foobarbaz'),
917
 
                    [('d', '', 0, False, ''),
918
 
                     ('a', '', 0, False, ''),
919
 
                     ]),
920
 
                ]
 
921
            old_root_entry = (('', '', 'TREE_ROOT'),
 
922
                              [('a', '', 0, False, ''),
 
923
                               ('d', '', 0, False, 'parent-revid')])
 
924
            new_root_entry = (('', '', 'Asecond-root-id'),
 
925
                              [('d', '', 0, False, ''),
 
926
                               ('a', '', 0, False, '')])
 
927
            expected_rows = [new_root_entry, old_root_entry]
921
928
            state._validate()
922
929
            self.assertEqual(expected_rows, list(state._iter_entries()))
 
930
            self.assertEqual(new_root_entry, state._get_entry(0, path_utf8=''))
 
931
            self.assertEqual(old_root_entry, state._get_entry(1, path_utf8=''))
 
932
            self.assertEqual((None, None),
 
933
                             state._get_entry(0, fileid_utf8='TREE_ROOT'))
 
934
            self.assertEqual(old_root_entry,
 
935
                             state._get_entry(1, fileid_utf8='TREE_ROOT'))
 
936
            self.assertEqual(new_root_entry,
 
937
                             state._get_entry(0, fileid_utf8='Asecond-root-id'))
 
938
            self.assertEqual((None, None),
 
939
                             state._get_entry(1, fileid_utf8='Asecond-root-id'))
923
940
            # should work across save too
924
941
            state.save()
925
942
        finally:
1000
1017
                [(('', '', root_id), [
1001
1018
                  ('d', '', 0, False, dirstate.DirState.NULLSTAT),
1002
1019
                  ('d', '', 0, False, revid1),
1003
 
                  ('d', '', 0, False, revid2)
 
1020
                  ('d', '', 0, False, revid1)
1004
1021
                  ])],
1005
1022
                list(state._iter_entries()))
1006
1023
        finally:
1034
1051
            (('', '', root_id), [
1035
1052
             ('d', '', 0, False, dirstate.DirState.NULLSTAT),
1036
1053
             ('d', '', 0, False, revid1.encode('utf8')),
1037
 
             ('d', '', 0, False, revid2.encode('utf8'))
 
1054
             ('d', '', 0, False, revid1.encode('utf8'))
1038
1055
             ]),
1039
1056
            (('', 'a file', 'file-id'), [
1040
1057
             ('a', '', 0, False, ''),