← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Robert Collins
  • Date: 2005-10-30 00:00:09 UTC
  • mfrom: (1185.16.134)
  • Revision ID: robertc@robertcollins.net-20051030000009-9db99a338a0dfdac
Merge from Martin.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
1
 
#! /usr/bin/python
2
 
 
3
1
import os
4
2
import unittest
5
3
 
6
 
from bzrlib.selftest import InTempDir, TestBase
 
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
7
5
from bzrlib.branch import ScratchBranch, Branch
8
6
from bzrlib.errors import NotBranchError, NotVersionedError
9
7
 
10
8
 
11
 
class Unknowns(InTempDir):
12
 
    def runTest(self):
13
 
        b = Branch('.', init=True)
 
9
class TestBranch(TestCaseInTempDir):
 
10
 
 
11
    def test_unknowns(self):
 
12
        b = Branch.initialize('.')
14
13
 
15
14
        self.build_tree(['hello.txt',
16
15
                         'hello.txt~'])
18
17
        self.assertEquals(list(b.unknowns()),
19
18
                          ['hello.txt'])
20
19
 
21
 
 
22
 
 
23
 
class ValidateRevisionId(TestBase):
24
 
    def runTest(self):
25
 
        from bzrlib.revision import validate_revision_id
26
 
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
27
 
        
28
 
        self.assertRaises(ValueError,
29
 
                          validate_revision_id,
30
 
                          ' asdkjas')
31
 
 
32
 
 
33
 
        self.assertRaises(ValueError,
34
 
                          validate_revision_id,
35
 
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
36
 
 
37
 
 
38
 
        self.assertRaises(ValueError,
39
 
                          validate_revision_id,
40
 
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
41
 
 
42
 
        self.assertRaises(ValueError,
43
 
                          validate_revision_id,
44
 
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
45
 
 
46
 
 
47
 
 
48
 
class PendingMerges(InTempDir):
49
 
    """Tracking pending-merged revisions."""
50
 
    def runTest(self):
51
 
        b = Branch('.', init=True)
52
 
 
53
 
        self.assertEquals(b.pending_merges(), [])
54
 
        
55
 
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
56
 
        
57
 
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
58
 
    
59
 
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
60
 
        
61
 
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
62
 
 
63
 
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
64
 
        self.assertEquals(b.pending_merges(),
65
 
                          ['foo@azkhazan-123123-abcabc',
66
 
                           'wibble@fofof--20050401--1928390812'])
67
 
 
68
 
        b.commit("commit from base with two merges")
69
 
 
70
 
        rev = b.get_revision(b.revision_history()[0])
71
 
        self.assertEquals(len(rev.parents), 2)
72
 
        self.assertEquals(rev.parents[0].revision_id,
73
 
                          'foo@azkhazan-123123-abcabc')
74
 
        self.assertEquals(rev.parents[1].revision_id,
75
 
                           'wibble@fofof--20050401--1928390812')
76
 
 
77
 
        # list should be cleared when we do a commit
78
 
        self.assertEquals(b.pending_merges(), [])
79
 
        
80
 
        
81
 
        
82
 
 
83
 
class Revert(InTempDir):
84
 
    """Test selected-file revert"""
85
 
    def runTest(self):
86
 
        b = Branch('.', init=True)
 
20
    def test_no_changes(self):
 
21
        from bzrlib.errors import PointlessCommit
 
22
        
 
23
        b = Branch.initialize('.')
 
24
 
 
25
        self.build_tree(['hello.txt'])
 
26
 
 
27
        self.assertRaises(PointlessCommit,
 
28
                          b.commit,
 
29
                          'commit without adding',
 
30
                          allow_pointless=False)
 
31
 
 
32
        b.commit('commit pointless tree',
 
33
                 allow_pointless=True)
 
34
 
 
35
        b.add('hello.txt')
 
36
        
 
37
        b.commit('commit first added file',
 
38
                 allow_pointless=False)
 
39
        
 
40
        self.assertRaises(PointlessCommit,
 
41
                          b.commit,
 
42
                          'commit after adding file',
 
43
                          allow_pointless=False)
 
44
        
 
45
        b.commit('commit pointless revision with one file',
 
46
                 allow_pointless=True)
 
47
 
 
48
 
 
49
class MoreTests(TestCaseInTempDir):
 
50
 
 
51
    def test_revert(self):
 
52
        """Test selected-file revert"""
 
53
        b = Branch.initialize('.')
87
54
 
88
55
        self.build_tree(['hello.txt'])
89
56
        file('hello.txt', 'w').write('initial hello')
108
75
        self.check_file_contents('hello.txt', 'initial hello')
109
76
        self.check_file_contents('hello.txt~', 'initial hello')
110
77
 
111
 
 
112
 
 
113
 
class RenameDirs(InTempDir):
114
 
    """Test renaming directories and the files within them."""
115
 
    def runTest(self):
116
 
        b = Branch('.', init=True)
 
78
    def test_rename_dirs(self):
 
79
        """Test renaming directories and the files within them."""
 
80
        b = Branch.initialize('.')
117
81
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
118
82
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
119
83
 
141
105
                                   ['newdir', 'newdir/newsub',
142
106
                                    'newdir/newsub/file'])
143
107
 
144
 
        
145
 
 
146
 
 
147
 
class BranchPathTestCase(TestBase):
148
 
    """test for branch path lookups
149
 
 
150
 
    Branch.relpath and bzrlib.branch._relpath do a simple but subtle
151
 
    job: given a path (either relative to cwd or absolute), work out
152
 
    if it is inside a branch and return the path relative to the base.
153
 
    """
154
 
 
155
 
    def runTest(self):
156
 
        from bzrlib.branch import _relpath
 
108
    def test_relpath(self):
 
109
        """test for branch path lookups
 
110
    
 
111
        bzrlib.osutils._relpath do a simple but subtle
 
112
        job: given a path (either relative to cwd or absolute), work out
 
113
        if it is inside a branch and return the path relative to the base.
 
114
        """
 
115
        from bzrlib.osutils import relpath
157
116
        import tempfile, shutil
158
117
        
159
118
        savedir = os.getcwdu()
160
119
        dtmp = tempfile.mkdtemp()
 
120
        # On Mac OSX, /tmp actually expands to /private/tmp
 
121
        dtmp = os.path.realpath(dtmp)
161
122
 
162
123
        def rp(p):
163
 
            return _relpath(dtmp, p)
 
124
            return relpath(dtmp, p)
164
125
        
165
126
        try:
166
127
            # check paths inside dtmp while standing outside it
187
148
            # directory, or nearby
188
149
            os.chdir(dtmp)
189
150
 
190
 
            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)
191
153
 
192
154
            self.assertEqual(rp('foo'), 'foo')
193
155
 
201
163
        finally:
202
164
            os.chdir(savedir)
203
165
            shutil.rmtree(dtmp)
204
 
 
205
 
 
206
 
 
207
 
 
208
 
TEST_CLASSES = [Unknowns,
209
 
                ValidateRevisionId,
210
 
                PendingMerges,
211
 
                Revert,
212
 
                RenameDirs,
213
 
                BranchPathTestCase,
214
 
                ]