← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

Change the use of run_bzr to run_bzr_captured in blackbox tests - inspired by David Clymers patch to change run_bzr usage to runbzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
45
45
        b.commit('commit pointless revision with one file',
46
46
                 allow_pointless=True)
47
47
 
48
 
 
49
 
class MoreTests(TestCaseInTempDir):
50
 
 
 
48
        b.add_pending_merge('mbp@892739123-2005-123123')
 
49
        b.commit('commit new merge with no text changes',
 
50
                 allow_pointless=False)
 
51
        
 
52
 
 
53
 
 
54
class TestRevisionId(TestCase):
 
55
    
 
56
    def test_validate_revision_id(self):
 
57
        from bzrlib.revision import validate_revision_id
 
58
        validate_revision_id('mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
59
        self.assertRaises(ValueError,
 
60
                          validate_revision_id,
 
61
                          ' asdkjas')
 
62
        self.assertRaises(ValueError,
 
63
                          validate_revision_id,
 
64
                          'mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe\n')
 
65
        self.assertRaises(ValueError,
 
66
                          validate_revision_id,
 
67
                          ' mbp@sourcefrog.net-20050311061123-96a255005c7c9dbe')
 
68
        self.assertRaises(ValueError,
 
69
                          validate_revision_id,
 
70
                          'Martin Pool <mbp@sourcefrog.net>-20050311061123-96a255005c7c9dbe')
 
71
 
 
72
 
 
73
class PendingMerges(TestCaseInTempDir):
 
74
 
 
75
    def test_pending_merges(self):
 
76
        """Tracking pending-merged revisions."""
 
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
        
51
98
    def test_revert(self):
52
99
        """Test selected-file revert"""
53
100
        b = Branch.initialize('.')
148
195
            # directory, or nearby
149
196
            os.chdir(dtmp)
150
197
 
151
 
            FOO_BAR_QUUX = os.path.join('foo', 'bar', 'quux')
152
 
            self.assertEqual(rp('foo/bar/quux'), FOO_BAR_QUUX)
 
198
            self.assertEqual(rp('foo/bar/quux'), 'foo/bar/quux')
153
199
 
154
200
            self.assertEqual(rp('foo'), 'foo')
155
201