← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Scott James Remnant
  • Date: 2005-10-10 06:57:08 UTC
  • mto: This revision was merged to the branch mainline in revision 1436.
  • Revision ID: scott@netsplit.com-20051010065708-7ebaebe2717cc0a4
Fix WorkingTree.get_symlink_target() to read the absolute path of the
symlink, not the relative; so we can do things outside of the root
directory.

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
48
        
52
49
 
53
50
 
70
67
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
71
68
 
72
69
 
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
 
        
 
70
class MoreTests(TestCaseInTempDir):
 
71
 
98
72
    def test_revert(self):
99
73
        """Test selected-file revert"""
100
 
        b = Branch('.', init=True)
 
74
        b = Branch.initialize('.')
101
75
 
102
76
        self.build_tree(['hello.txt'])
103
77
        file('hello.txt', 'w').write('initial hello')
124
98
 
125
99
    def test_rename_dirs(self):
126
100
        """Test renaming directories and the files within them."""
127
 
        b = Branch('.', init=True)
 
101
        b = Branch.initialize('.')
128
102
        self.build_tree(['dir/', 'dir/sub/', 'dir/sub/file'])
129
103
        b.add(['dir', 'dir/sub', 'dir/sub/file'])
130
104
 
195
169
            # directory, or nearby
196
170
            os.chdir(dtmp)
197
171
 
198
 
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
 
172
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
 
173
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
199
174
 
200
175
            self.assertEqual(rp('foo'), 'foo')
201
176