← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_added.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2010, 2016 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
47
47
                command += ' --null'
48
48
 
49
49
            out, err = self.run_bzr(command)
50
 
            self.assertEquals(out, expected)
51
 
            self.assertEquals(err, '')
 
50
            self.assertEqual(out, expected)
 
51
            self.assertEqual(err, '')
52
52
 
53
53
        # in empty directory, nothing added
54
54
        tree = self.make_branch_and_tree('.')
74
74
        self.build_tree(['a/README'])
75
75
        tree.add('README')
76
76
        out, err = self.run_bzr(['added', '--directory=a'])
77
 
        self.assertEquals('README\n', out)
 
77
        self.assertEqual('README\n', out)