← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/whitebox.py

  • Committer: Aaron Bentley
  • Date: 2005-07-29 17:19:16 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1020.
  • Revision ID: abentley@panoramicfeedback.com-20050729171916-322fd81b451d2e3e
Added merge-type parameter to merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/whitebox.py
20
20
 
21
21
 
22
22
 
 
23
class NoChanges(InTempDir):
 
24
    def runTest(self):
 
25
        from bzrlib.errors import PointlessCommit
 
26
        
 
27
        b = Branch('.', init=True)
 
28
 
 
29
        self.build_tree(['hello.txt'])
 
30
 
 
31
        self.assertRaises(PointlessCommit,
 
32
                          b.commit,
 
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
        
 
56
 
 
57
 
23
58
class ValidateRevisionId(TestBase):
24
59
    def runTest(self):
25
60
        from bzrlib.revision import validate_revision_id
158
193
        
159
194
        savedir = os.getcwdu()
160
195
        dtmp = tempfile.mkdtemp()
 
196
        # On Mac OSX, /tmp actually expands to /private/tmp
 
197
        dtmp = os.path.realpath(dtmp)
161
198
 
162
199
        def rp(p):
163
200
            return _relpath(dtmp, p)