← 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-22 12:12:53 UTC
  • Revision ID: mbp@sourcefrog.net-20050922121253-eae2a3240ea5e493
- upgrade can no longer be done in current version branches
  so don't test it

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('.')
24
 
 
 
25
        b = Branch('.', init=True)
25
26
        self.build_tree(['hello.txt'])
26
27
 
27
28
        self.assertRaises(PointlessCommit,
67
68
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
68
69
 
69
70
 
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
 
 
99
71
class MoreTests(TestCaseInTempDir):
100
 
 
101
72
    def test_revert(self):
102
73
        """Test selected-file revert"""
103
 
        b = Branch.initialize('.')
 
74
        b = Branch('.', init=True)
104
75
 
105
76
        self.build_tree(['hello.txt'])
106
77
        file('hello.txt', 'w').write('initial hello')
127
98
 
128
99
    def test_rename_dirs(self):
129
100
        """Test renaming directories and the files within them."""
130
 
        b = Branch.initialize('.')
 
101
        b = Branch('.', init=True)
131
102
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
132
103
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
133
104
 
198
169
            # directory, or nearby
199
170
            os.chdir(dtmp)
200
171
 
201
 
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
202
 
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
 
172
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
203
173
 
204
174
            self.assertEqual(rp('foo'), 'foo')
205
175