← 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-09-27 07:24:40 UTC
  • mfrom: (1185.1.41)
  • Revision ID: robertc@robertcollins.net-20050927072440-1bf4d99c3e1db5b3
pair programming worx... merge integration and weave

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
 
11
9
class TestBranch(TestCaseInTempDir):
12
10
 
13
11
    def test_unknowns(self):
14
 
        b = Branch('.', init=True)
 
12
        b = Branch.initialize('.')
15
13
 
16
14
        self.build_tree(['hello.txt',
17
15
                         'hello.txt~'])
22
20
    def test_no_changes(self):
23
21
        from bzrlib.errors import PointlessCommit
24
22
        
25
 
        b = Branch('.', init=True)
 
23
        b = Branch.initialize('.')
 
24
 
26
25
        self.build_tree(['hello.txt'])
27
26
 
28
27
        self.assertRaises(PointlessCommit,
68
67
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
69
68
 
70
69
 
 
70
class PendingMerges(TestCaseInTempDir):
 
71
 
 
72
    def test_pending_merges(self):
 
73
        """Tracking pending-merged revisions."""
 
74
        print "GHOST SUPPORT REMOVED"
 
75
        return
 
76
 
 
77
        b = Branch.initialize('.')
 
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
 
 
98
 
71
99
class MoreTests(TestCaseInTempDir):
 
100
 
72
101
    def test_revert(self):
73
102
        """Test selected-file revert"""
74
 
        b = Branch('.', init=True)
 
103
        b = Branch.initialize('.')
75
104
 
76
105
        self.build_tree(['hello.txt'])
77
106
        file('hello.txt', 'w').write('initial hello')
98
127
 
99
128
    def test_rename_dirs(self):
100
129
        """Test renaming directories and the files within them."""
101
 
        b = Branch('.', init=True)
 
130
        b = Branch.initialize('.')
102
131
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
103
132
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
104
133
 
169
198
            # directory, or nearby
170
199
            os.chdir(dtmp)
171
200
 
172
 
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
 
201
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
 
202
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
173
203
 
174
204
            self.assertEqual(rp('foo'), 'foo')
175
205