← 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: Vincent Ladeuil
  • Date: 2011-10-04 11:38:49 UTC
  • mfrom: (6184 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6185.
  • Revision ID: v.ladeuil+lp@free.fr-20111004113849-9os4pc4swnvdklxk
Merge trunk to resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
1345
1345
     stacked on: mainline
1346
1346
""", out)
1347
1347
        self.assertEqual("", err)
 
1348
 
 
1349
    def test_info_revinfo_optional(self):
 
1350
        tree = self.make_branch_and_tree('.')
 
1351
        def last_revision_info(self):
 
1352
            raise errors.UnsupportedOperation(last_revision_info, self)
 
1353
        self.overrideAttr(
 
1354
            branch.Branch, "last_revision_info", last_revision_info)
 
1355
        out, err = self.run_bzr('info -v .')
 
1356
        self.assertEqual(
 
1357
"""Standalone tree (format: 2a)
 
1358
Location:
 
1359
  branch root: .
 
1360
 
 
1361
Format:
 
1362
       control: Meta directory format 1
 
1363
  working tree: Working tree format 6
 
1364
        branch: Branch format 7
 
1365
    repository: Repository format 2a - rich roots, group compression and chk inventories
 
1366
 
 
1367
In the working tree:
 
1368
         0 unchanged
 
1369
         0 modified
 
1370
         0 added
 
1371
         0 removed
 
1372
         0 renamed
 
1373
         0 unknown
 
1374
         0 ignored
 
1375
         0 versioned subdirectories
 
1376
""", out)
 
1377
        self.assertEqual("", err)