~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_unknowns.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:
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007-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
28
28
 
29
29
        # in empty directory, no unknowns
30
30
        tree = self.make_branch_and_tree('.')
31
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
31
        self.assertEqual(self.run_bzr('unknowns')[0], '')
32
32
 
33
33
        # single unknown file
34
34
        self.build_tree_contents([('a', 'contents of a\n')])
35
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'a\n')
 
35
        self.assertEqual(self.run_bzr('unknowns')[0], 'a\n')
36
36
 
37
37
        # multiple unknown files, including one with a space in its name
38
38
        self.build_tree(['b', 'c', 'd e'])
39
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'a\nb\nc\n"d e"\n')
 
39
        self.assertEqual(self.run_bzr('unknowns')[0], 'a\nb\nc\n"d e"\n')
40
40
 
41
41
        # after add, file no longer shown
42
42
        tree.add(['a', 'd e'])
43
 
        self.assertEquals(self.run_bzr('unknowns')[0], 'b\nc\n')
 
43
        self.assertEqual(self.run_bzr('unknowns')[0], 'b\nc\n')
44
44
 
45
45
        # after all added, none shown
46
46
        tree.add(['b', 'c'])
47
 
        self.assertEquals(self.run_bzr('unknowns')[0], '')
 
47
        self.assertEqual(self.run_bzr('unknowns')[0], '')
48
48
 
49
49
    def test_unknowns_directory(self):
50
50
        """Test --directory option"""
51
51
        tree = self.make_branch_and_tree('a')
52
52
        self.build_tree(['a/README'])
53
53
        out, err = self.run_bzr(['unknowns', '--directory=a'])
54
 
        self.assertEquals('README\n', out)
 
54
        self.assertEqual('README\n', out)