← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_scenarios.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_scenarios.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
64
64
            self,
65
65
            vary_by_color(),
66
66
            suite)
67
 
        self.assertEquals(
 
67
        self.assertEqual(
68
68
            ['blue', 'green', 'red'],
69
69
            get_generated_test_attributes(suite, 'color'))
70
70
 
74
74
            vary_named_attribute('one'),
75
75
            vary_named_attribute('two'),
76
76
            )
77
 
        self.assertEquals(
 
77
        self.assertEqual(
78
78
            2*2,
79
79
            len(s),
80
80
            s)
86
86
        multiply_tests_by_their_scenarios(
87
87
            test_instance,
88
88
            suite)
89
 
        self.assertEquals(
 
89
        self.assertEqual(
90
90
            ['a', 'a', 'b', 'b'],
91
91
            get_generated_test_attributes(suite, 'value'))
92
92