← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Martin Pool
  • Date: 2005-09-12 09:50:44 UTC
  • Revision ID: mbp@sourcefrog.net-20050912095044-6acfdb5611729987
- no tests in bzrlib.fetch anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
 
1
#! /usr/bin/python
 
2
 
1
3
import os
2
4
import unittest
3
5
 
9
11
class TestBranch(TestCaseInTempDir):
10
12
 
11
13
    def test_unknowns(self):
12
 
        b = Branch.initialize('.')
 
14
        b = Branch('.', init=True)
13
15
 
14
16
        self.build_tree(['hello.txt',
15
17
                         'hello.txt~'])
20
22
    def test_no_changes(self):
21
23
        from bzrlib.errors import PointlessCommit
22
24
        
23
 
        b = Branch.initialize('.')
 
25
        b = Branch('.', init=True)
24
26
 
25
27
        self.build_tree(['hello.txt'])
26
28
 
45
47
        b.commit('commit pointless revision with one file',
46
48
                 allow_pointless=True)
47
49
 
 
50
        b.add_pending_merge('mbp@892739123-2005-123123')
 
51
        b.commit('commit new merge with no text changes',
 
52
                 allow_pointless=False)
48
53
        
49
54
 
50
55
 
67
72
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
68
73
 
69
74
 
70
 
class MoreTests(TestCaseInTempDir):
71
 
 
 
75
class PendingMerges(TestCaseInTempDir):
 
76
 
 
77
    def test_pending_merges(self):
 
78
        """Tracking pending-merged revisions."""
 
79
        b = Branch('.', init=True)
 
80
 
 
81
        self.assertEquals(b.pending_merges(), [])
 
82
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
83
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
84
        b.add_pending_merge('foo@azkhazan-123123-abcabc')
 
85
        self.assertEquals(b.pending_merges(), ['foo@azkhazan-123123-abcabc'])
 
86
        b.add_pending_merge('wibble@fofof--20050401--1928390812')
 
87
        self.assertEquals(b.pending_merges(),
 
88
                          ['foo@azkhazan-123123-abcabc',
 
89
                           'wibble@fofof--20050401--1928390812'])
 
90
        b.commit("commit from base with two merges")
 
91
        rev = b.get_revision(b.revision_history()[0])
 
92
        self.assertEquals(len(rev.parents), 2)
 
93
        self.assertEquals(rev.parents[0].revision_id,
 
94
                          'foo@azkhazan-123123-abcabc')
 
95
        self.assertEquals(rev.parents[1].revision_id,
 
96
                           'wibble@fofof--20050401--1928390812')
 
97
        # list should be cleared when we do a commit
 
98
        self.assertEquals(b.pending_merges(), [])
 
99
        
72
100
    def test_revert(self):
73
101
        """Test selected-file revert"""
74
 
        b = Branch.initialize('.')
 
102
        b = Branch('.', init=True)
75
103
 
76
104
        self.build_tree(['hello.txt'])
77
105
        file('hello.txt', 'w').write('initial hello')
98
126
 
99
127
    def test_rename_dirs(self):
100
128
        """Test renaming directories and the files within them."""
101
 
        b = Branch.initialize('.')
 
129
        b = Branch('.', init=True)
102
130
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
103
131
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
104
132
 
169
197
            # directory, or nearby
170
198
            os.chdir(dtmp)
171
199
 
172
 
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
173
 
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
 
200
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
174
201
 
175
202
            self.assertEqual(rp('foo'), 'foo')
176
203