~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010, 2016 Canonical Ltd
 
1
# Copyright (C) 2006-2010 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.assertEqual(out, expected)
51
 
            self.assertEqual(err, '')
 
50
            self.assertEquals(out, expected)
 
51
            self.assertEquals(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.assertEqual('README\n', out)
 
77
        self.assertEquals('README\n', out)