← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2016-02-01 18:09:18 UTC
  • mfrom: (6614.1.3 assert)
  • mto: This revision was merged to the branch mainline in revision 6615.
  • Revision ID: v.ladeuil+lp@free.fr-20160201180918-jqtq8ol6gdbbbtpv
Fix deprecated assertions to unblock release

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_script.py
1
 
# Copyright (C) 2010 Canonical Ltd
 
1
# Copyright (C) 2010, 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
36
36
        out, err = self.run_bzr(['test-script', 'script'])
37
37
        out_lines = out.splitlines()
38
38
        self.assertStartsWith(out_lines[-3], 'Ran 1 test in ')
39
 
        self.assertEquals('OK', out_lines[-1])
40
 
        self.assertEquals('', err)
 
39
        self.assertEqual('OK', out_lines[-1])
 
40
        self.assertEqual('', err)
41
41
 
42
42
    def test_simple_file(self):
43
43
        self.build_tree_contents([('script', '''
47
47
        out, err = self.run_bzr(['test-script', 'script'])
48
48
        out_lines = out.splitlines()
49
49
        self.assertStartsWith(out_lines[-3], 'Ran 1 test in ')
50
 
        self.assertEquals('OK', out_lines[-1])
51
 
        self.assertEquals('', err)
 
50
        self.assertEqual('OK', out_lines[-1])
 
51
        self.assertEqual('', err)
52
52
 
53
53
    def test_null_output(self):
54
54
        self.build_tree_contents([('script', '''
57
57
        out, err = self.run_bzr(['test-script', 'script', '--null-output'])
58
58
        out_lines = out.splitlines()
59
59
        self.assertStartsWith(out_lines[-3], 'Ran 1 test in ')
60
 
        self.assertEquals('OK', out_lines[-1])
61
 
        self.assertEquals('', err)
 
60
        self.assertEqual('OK', out_lines[-1])
 
61
        self.assertEqual('', err)
62
62
 
63
63
    def test_failing_script(self):
64
64
        self.build_tree_contents([('script', '''
68
68
        out, err = self.run_bzr(['test-script', 'script'], retcode=1)
69
69
        out_lines = out.splitlines()
70
70
        self.assertStartsWith(out_lines[-3], 'Ran 1 test in ')
71
 
        self.assertEquals('FAILED (failures=1)', out_lines[-1])
72
 
        self.assertEquals('', err)
 
71
        self.assertEqual('FAILED (failures=1)', out_lines[-1])
 
72
        self.assertEqual('', err)