← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_status.py

  • Committer: Jelmer Vernooij
  • Date: 2016-04-03 16:32:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6617.
  • Revision ID: jelmer@jelmer.uk-20160403163231-h72bo0uyek2gikw0
https://launchpad.net/bugs/1565503
Don't put French text in doc/en/user-reference when LANGUAGE=fr_CH.UTF_8.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_status.py
46
46
        self.assertContainsRe(output.getvalue(), 'empty commit')
47
47
 
48
48
    def make_multiple_pending_tree(self):
49
 
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
 
49
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
50
50
        tree = self.make_branch_and_tree('a')
51
51
        tree.commit('commit 1', timestamp=1196796819, timezone=0)
52
52
        tree2 = tree.bzrdir.clone('b').open_workingtree()
102
102
 
103
103
    def test_pending_with_ghosts(self):
104
104
        """Test when a pending merge's ancestry includes ghosts."""
105
 
        config.GlobalConfig().set_user_option('email', 'Joe Foo <joe@foo.com>')
 
105
        config.GlobalStack().set('email', 'Joe Foo <joe@foo.com>')
106
106
        tree = self.make_branch_and_tree('a')
107
107
        tree.commit('empty commit')
108
108
        tree2 = tree.bzrdir.clone('b').open_workingtree()
169
169
        params = calls[0]
170
170
        self.assertIsInstance(params, _mod_status.StatusHookParams)
171
171
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
172
 
            'show_ids', 'short', 'verbose']
 
172
            'show_ids', 'short', 'verbose', 'specific_files']
173
173
        for a in attrs:
174
174
            self.assertTrue(hasattr(params, a),
175
175
                'Attribute "%s" not found in StatusHookParam' % a)
192
192
        params = calls[0]
193
193
        self.assertIsInstance(params, _mod_status.StatusHookParams)
194
194
        attrs = ['old_tree', 'new_tree', 'to_file', 'versioned',
195
 
            'show_ids', 'short', 'verbose']
 
195
            'show_ids', 'short', 'verbose', 'specific_files']
196
196
        for a in attrs:
197
197
            self.assertTrue(hasattr(params, a),
198
198
                'Attribute "%s" not found in StatusHookParam' % a)