/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/tests/test_ui.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
257
257
        ui.show_user_warning('cross_format_fetch', from_format=RepositoryFormat2a(),
258
258
            to_format=remote_fmt)
259
259
        self.assertEqual('', ui.stdout.getvalue())
260
 
        self.assertEqual("Doing on-the-fly conversion from RepositoryFormat2a() to "
261
 
            "RemoteRepositoryFormat(_network_name='Bazaar RepositoryFormatKnitPack5 "
262
 
            "(bzr 1.6)\\n').\nThis may take some time. Upgrade the repositories to "
263
 
            "the same format for better performance.\n",
264
 
            ui.stderr.getvalue())
 
260
        self.assertContainsRe(
 
261
            ui.stderr.getvalue(),
 
262
            "^Doing on-the-fly conversion from RepositoryFormat2a\(\) to "
 
263
                "RemoteRepositoryFormat\(_network_name="
 
264
                "b?'Bazaar RepositoryFormatKnitPack5 \(bzr 1.6\)\\\\n'\)\.\n"
 
265
            "This may take some time. Upgrade the repositories to "
 
266
                "the same format for better performance\.\n$")
265
267
        # and now with it suppressed please
266
268
        ui = ui_testing.TextUIFactory()
267
269
        ui.suppressed_warnings.add('cross_format_fetch')