← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2016-02-01 16:50:54 UTC
  • mto: (6614.2.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6615.
  • Revision ID: v.ladeuil+lp@free.fr-20160201165054-ihgm2jt16ire1sye
Fix assert_ being deprecated by using assertTrue.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005-2012, 2016 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
188
188
        wt2.merge_from_branch(wt.branch)
189
189
        message = self.status_string(wt2, verbose=True)
190
190
        self.assertStartsWith(message, "pending merges:\n")
191
 
        self.assert_("Empty commit 3" in message)
 
191
        self.assertTrue("Empty commit 3" in message)
192
192
        self.assertEndsWith(message, "...\n")
193
193
 
194
194
    def test_tree_status_ignores(self):