← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revisionnamespaces.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-21 22:34:49 UTC
  • mto: This revision was merged to the branch mainline in revision 1979.
  • Revision ID: john@arbash-meinel.com-20060821223449-7fa2156e1976a836
More revno: tests, now testing the branch/url parameter

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revisionnamespaces.py
255
255
    def test_missing_number_and_branch(self):
256
256
        self.assertInvalid('revno::',
257
257
                           extra='; cannot have an empty revno and no branch')
 
258
 
 
259
    def test_invalid_number_with_branch(self):
 
260
        try:
 
261
            int('X')
 
262
        except ValueError, e:
 
263
            pass
 
264
        self.assertInvalid('revno:X:tree2', extra='; ' + str(e))
 
265
 
 
266
    def test_with_branch(self):
 
267
        # Passing a URL overrides the supplied branch path
 
268
        revinfo = self.get_in_history('revno:2:tree2')
 
269
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
 
270
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
 
271
        self.assertEqual(2, revinfo.revno)
 
272
        self.assertEqual('alt_r2', revinfo.rev_id)
 
273
 
 
274
    def test_with_url(self):
 
275
        url = self.get_url() + '/tree2'
 
276
        revinfo = self.get_in_history('revno:2:%s' % (url,))
 
277
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
 
278
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
 
279
        self.assertEqual(2, revinfo.revno)
 
280
        self.assertEqual('alt_r2', revinfo.rev_id)
 
281
 
 
282
    def test_negative_with_url(self):
 
283
        url = self.get_url() + '/tree2'
 
284
        revinfo = self.get_in_history('revno:-1:%s' % (url,))
 
285
        self.assertNotEqual(self.tree.branch.base, revinfo.branch.base)
 
286
        self.assertEqual(self.tree2.branch.base, revinfo.branch.base)
 
287
        self.assertEqual(2, revinfo.revno)
 
288
        self.assertEqual('alt_r2', revinfo.rev_id)
 
289
 
 
290
    def test_invalid_branch(self):
 
291
        self.assertRaises(errors.NotBranchError,
 
292
                          self.get_in_history, 'revno:-1:tree3')
 
293
 
 
294
    def test_invalid_revno_in_branch(self):
 
295
        self.tree.commit('three', rev_id='r3')
 
296
        self.assertInvalid('revno:3:tree2')