← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_version_info.py

  • Committer: John Arbash Meinel
  • Date: 2012-09-19 07:58:27 UTC
  • mfrom: (6437.63.9 2.5)
  • mto: This revision was merged to the branch mainline in revision 6563.
  • Revision ID: john@arbash-meinel.com-20120919075827-36b2b042kiaps0d3
Merge bzr-2.5.2 into trunk to get the fixes for ConnectionReset.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_version_info.py
1
 
# Copyright (C) 2005-2012, 2016 Canonical Ltd
 
1
# Copyright (C) 2005-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
339
339
        builder = CustomVersionInfoBuilder(wt.branch, working_tree=wt,
340
340
            template='revno: {revno}')
341
341
        builder.generate(sio)
342
 
        self.assertEqual("revno: 0", sio.getvalue())
 
342
        self.assertEquals("revno: 0", sio.getvalue())
343
343
 
344
344
        builder = CustomVersionInfoBuilder(wt.branch, working_tree=wt, 
345
345
            template='{revno} revid: {revision_id}')
353
353
        builder = CustomVersionInfoBuilder(wt.branch, working_tree=wt, 
354
354
            template='{revno} revid: {revision_id}')
355
355
        builder.generate(sio)
356
 
        self.assertEqual("1.1.1 revid: o2", sio.getvalue())
 
356
        self.assertEquals("1.1.1 revid: o2", sio.getvalue())
357
357
 
358
358
    def regen(self, wt, tpl, **kwargs):
359
359
        sio = StringIO()