/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2010-03-24 14:15:01 UTC
  • mto: (5107.2.1 integration2)
  • mto: This revision was merged to the branch mainline in revision 5109.
  • Revision ID: v.ladeuil+lp@free.fr-20100324141501-04ln5zfqtsgzaaxl
Use single quotes so that no test need to be updated.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_diff.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
134
134
 
135
135
    def test_diff_nonexistent_revision(self):
136
136
        out, err = self.run_bzr('diff -r 123', retcode=3,
137
 
            error_regexes=("Requested revision: ['\"]123['\"] does not "
 
137
            error_regexes=("Requested revision: '123' does not "
138
138
                "exist in branch:",))
139
139
 
140
140
    def test_diff_nonexistent_dotted_revision(self):
141
141
        out, err = self.run_bzr('diff -r 1.1', retcode=3)
142
142
        self.assertContainsRe(err,
143
 
            "Requested revision: ['\"]1.1['\"] does not exist in branch:")
 
143
            "Requested revision: '1.1' does not exist in branch:")
144
144
 
145
145
    def test_diff_nonexistent_dotted_revision_change(self):
146
146
        out, err = self.run_bzr('diff -c 1.1', retcode=3)
147
147
        self.assertContainsRe(err,
148
 
            "Requested revision: ['\"]1.1['\"] does not exist in branch:")
 
148
            "Requested revision: '1.1' does not exist in branch:")
149
149
 
150
150
    def test_diff_unversioned(self):
151
151
        # Get an error when diffing a non-versioned file.