~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Patch Queue Manager
  • Date: 2016-02-01 19:56:05 UTC
  • mfrom: (6615.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20160201195605-o7rl92wf6uyum3fk
(vila) Open trunk again as 2.8b1 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006 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
21
21
import os
22
22
 
23
23
from bzrlib.branch import Branch
24
 
from bzrlib.tests.blackbox import ExternalBase
25
 
 
26
 
 
27
 
class TestAdded(ExternalBase):
 
24
from bzrlib.tests import TestCaseWithTransport
 
25
 
 
26
 
 
27
class TestAdded(TestCaseWithTransport):
28
28
 
29
29
    def test_added(self):
30
30
        """Test that 'added' command reports added files"""
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('.')
67
67
        # after commit, now no longer listed
68
68
        tree.commit(message='add "%s"' % (name))
69
69
        check_added('')
 
70
 
 
71
    def test_added_directory(self):
 
72
        """Test --directory option"""
 
73
        tree = self.make_branch_and_tree('a')
 
74
        self.build_tree(['a/README'])
 
75
        tree.add('README')
 
76
        out, err = self.run_bzr(['added', '--directory=a'])
 
77
        self.assertEqual('README\n', out)