← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_info.py

  • Committer: Andrew Bennetts
  • Date: 2011-04-08 03:31:54 UTC
  • mfrom: (5766 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5767.
  • Revision ID: andrew.bennetts@canonical.com-20110408033154-la08nghd4391sw5m
Merge latest lp:bzr, move our new release notes entries to the current release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
276
276
        tree5 = branch1.create_checkout('lightcheckout', lightweight=True)
277
277
        branch5 = tree5.branch
278
278
        out, err = self.run_bzr('info -v lightcheckout')
 
279
        if "metaweave" in bzrdir.format_registry:
 
280
            format_description = "knit or metaweave"
 
281
        else:
 
282
            format_description = "knit"
279
283
        self.assertEqualDiff(
280
 
"""Lightweight checkout (format: knit or metaweave)
 
284
"""Lightweight checkout (format: %s)
281
285
Location:
282
286
  light checkout root: lightcheckout
283
287
   checkout of branch: standalone
306
310
 
307
311
Repository:
308
312
         1 revision
309
 
""" % (datestring_first, datestring_first,), out)
 
313
""" % (format_description, datestring_first, datestring_first,), out)
310
314
        self.assertEqual('', err)
311
315
 
312
316
        # Update initial standalone branch
439
443
        # Out of date lightweight checkout
440
444
        out, err = self.run_bzr('info lightcheckout --verbose')
441
445
        self.assertEqualDiff(
442
 
"""Lightweight checkout (format: knit or metaweave)
 
446
"""Lightweight checkout (format: %s)
443
447
Location:
444
448
  light checkout root: lightcheckout
445
449
   checkout of branch: standalone
470
474
 
471
475
Repository:
472
476
         2 revisions
473
 
""" % (datestring_first, datestring_last,), out)
 
477
""" % (format_description, datestring_first, datestring_last,), out)
474
478
        self.assertEqual('', err)
475
479
 
476
480
    def test_info_standalone_no_tree(self):