/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Martin Pool
  • Date: 2005-07-11 03:27:43 UTC
  • Revision ID: mbp@sourcefrog.net-20050711032743-a3a75b7f82975e7f
- Optionally raise EmptyCommit if there are no changes.  Test for this.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
22
22
 
23
23
class NoChanges(InTempDir):
24
24
    def runTest(self):
25
 
        from bzrlib.errors import PointlessCommit
 
25
        from bzrlib.errors import EmptyCommit
26
26
        
27
27
        b = Branch('.', init=True)
28
28
 
29
29
        self.build_tree(['hello.txt'])
30
30
 
31
 
        self.assertRaises(PointlessCommit,
 
31
        self.assertRaises(EmptyCommit,
32
32
                          b.commit,
33
33
                          'commit without adding',
34
 
                          allow_pointless=False)
35
 
 
36
 
        b.commit('commit pointless tree',
37
 
                 allow_pointless=True)
38
 
 
39
 
        b.add('hello.txt')
40
 
        
41
 
        b.commit('commit first added file',
42
 
                 allow_pointless=False)
43
 
        
44
 
        self.assertRaises(PointlessCommit,
45
 
                          b.commit,
46
 
                          'commit after adding file',
47
 
                          allow_pointless=False)
48
 
        
49
 
        b.commit('commit pointless revision with one file',
50
 
                 allow_pointless=True)
51
 
 
52
 
        b.add_pending_merge('mbp@892739123-2005-123123')
53
 
        b.commit('commit new merge with no text changes',
54
 
                 allow_pointless=False)
55
 
        
 
34
                          allow_empty=False)
 
35
 
 
36
 
56
37
 
57
38
 
58
39
class ValidateRevisionId(TestBase):
193
174
        
194
175
        savedir = os.getcwdu()
195
176
        dtmp = tempfile.mkdtemp()
196
 
        # On Mac OSX, /tmp actually expands to /private/tmp
197
 
        dtmp = os.path.realpath(dtmp)
198
177
 
199
178
        def rp(p):
200
179
            return _relpath(dtmp, p)