← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: John Arbash Meinel
  • Date: 2005-11-08 18:36:26 UTC
  • mto: This revision was merged to the branch mainline in revision 1727.
  • Revision ID: john@arbash-meinel.com-20051108183626-71f8414338043265
Updating unified_diff to take a factory, using the new diff algorithm in the code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
9
9
class TestBranch(TestCaseInTempDir):
10
10
 
11
11
    def test_unknowns(self):
12
 
        b = Branch('.', init=True)
 
12
        b = Branch.initialize('.')
13
13
 
14
14
        self.build_tree(['hello.txt',
15
15
                         'hello.txt~'])
20
20
    def test_no_changes(self):
21
21
        from bzrlib.errors import PointlessCommit
22
22
        
23
 
        b = Branch('.', init=True)
 
23
        b = Branch.initialize('.')
24
24
 
25
25
        self.build_tree(['hello.txt'])
26
26
 
45
45
        b.commit('commit pointless revision with one file',
46
46
                 allow_pointless=True)
47
47
 
48
 
        b.add_pending_merge('mbp@892739123-2005-123123')
49
 
        b.commit('commit new merge with no text changes',
50
 
                 allow_pointless=False)
51
 
        
52
 
 
53
 
 
54
 
class TestRevisionId(TestCase):
55
 
    
56
 
    def test_validate_revision_id(self):
57
 
        from bzrlib.revision import validate_revision_id
58
 
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
59
 
        self.assertRaises(ValueError,
60
 
                          validate_revision_id,
61
 
                          ' asdkjas')
62
 
        self.assertRaises(ValueError,
63
 
                          validate_revision_id,
64
 
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
65
 
        self.assertRaises(ValueError,
66
 
                          validate_revision_id,
67
 
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
68
 
        self.assertRaises(ValueError,
69
 
                          validate_revision_id,
70
 
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
71
 
 
72
 
 
73
 
class PendingMerges(TestCaseInTempDir):
74
 
 
75
 
    def test_pending_merges(self):
76
 
        """Tracking pending-merged revisions."""
77
 
        b = Branch('.', init=True)
78
 
 
79
 
        self.assertEquals(b.pending_merges(), [])
80
 
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
81
 
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
82
 
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
83
 
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
84
 
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
85
 
        self.assertEquals(b.pending_merges(),
86
 
                          ['foo@azkhazan-123123-abcabc',
87
 
                           'wibble@fofof--20050401--1928390812'])
88
 
        b.commit("commit from base with two merges")
89
 
        rev = b.get_revision(b.revision_history()[0])
90
 
        self.assertEquals(len(rev.parents), 2)
91
 
        self.assertEquals(rev.parents[0].revision_id,
92
 
                          'foo@azkhazan-123123-abcabc')
93
 
        self.assertEquals(rev.parents[1].revision_id,
94
 
                           'wibble@fofof--20050401--1928390812')
95
 
        # list should be cleared when we do a commit
96
 
        self.assertEquals(b.pending_merges(), [])
97
 
        
 
48
 
 
49
class MoreTests(TestCaseInTempDir):
 
50
 
98
51
    def test_revert(self):
99
52
        """Test selected-file revert"""
100
 
        b = Branch('.', init=True)
 
53
        b = Branch.initialize('.')
101
54
 
102
55
        self.build_tree(['hello.txt'])
103
56
        file('hello.txt', 'w').write('initial hello')
124
77
 
125
78
    def test_rename_dirs(self):
126
79
        """Test renaming directories and the files within them."""
127
 
        b = Branch('.', init=True)
 
80
        b = Branch.initialize('.')
128
81
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
129
82
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
130
83
 
144
97
 
145
98
        b.rename_one('dir', 'newdir')
146
99
 
147
 
        self.check_inventory_shape(b.inventory,
 
100
        self.check_inventory_shape(b.working_tree().read_working_inventory(),
148
101
                                   ['newdir', 'newdir/sub', 'newdir/sub/file'])
149
102
 
150
103
        b.rename_one('newdir/sub', 'newdir/newsub')
151
 
        self.check_inventory_shape(b.inventory,
 
104
        self.check_inventory_shape(b.working_tree().read_working_inventory(),
152
105
                                   ['newdir', 'newdir/newsub',
153
106
                                    'newdir/newsub/file'])
154
107
 
155
108
    def test_relpath(self):
156
109
        """test for branch path lookups
157
110
    
158
 
        Branch.relpath and bzrlib.branch._relpath do a simple but subtle
 
111
        bzrlib.osutils._relpath do a simple but subtle
159
112
        job: given a path (either relative to cwd or absolute), work out
160
113
        if it is inside a branch and return the path relative to the base.
161
114
        """
162
 
        from bzrlib.branch import _relpath
 
115
        from bzrlib.osutils import relpath
163
116
        import tempfile, shutil
164
117
        
165
118
        savedir = os.getcwdu()
168
121
        dtmp = os.path.realpath(dtmp)
169
122
 
170
123
        def rp(p):
171
 
            return _relpath(dtmp, p)
 
124
            return relpath(dtmp, p)
172
125
        
173
126
        try:
174
127
            # check paths inside dtmp while standing outside it
195
148
            # directory, or nearby
196
149
            os.chdir(dtmp)
197
150
 
198
 
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
 
151
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
 
152
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
199
153
 
200
154
            self.assertEqual(rp('foo'), 'foo')
201
155