/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_ls.py

  • Committer: John Arbash Meinel
  • Date: 2009-06-12 18:05:15 UTC
  • mto: (4371.4.5 vila-better-heads)
  • mto: This revision was merged to the branch mainline in revision 4449.
  • Revision ID: john@arbash-meinel.com-20090612180515-t0cwbjsnve094oik
Add a failing test for handling nodes that are in the same linear chain.

It fails because the ancestry skipping causes us to miss the fact that the two nodes
are actually directly related. We could check at the beginning, as the 
code used to do, but I think that will be incomplete for the more-than-two
heads cases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_ls.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006 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
54
54
    def test_ls_basic(self):
55
55
        """Test the abilities of 'bzr ls'"""
56
56
        self.ls_equals('.bzrignore\na\n')
57
 
        self.ls_equals('.bzrignore\na\n', './')
58
57
        self.ls_equals('?        .bzrignore\n'
59
58
                       '?        a\n',
60
59
                       '--verbose')
130
129
        self.ls_equals('b\n')
131
130
        self.ls_equals('b\0'
132
131
                  , '--null')
133
 
        self.ls_equals('subdir/b\n'
 
132
        self.ls_equals('.bzrignore\n'
 
133
                       'a\n'
 
134
                       'subdir/\n'
 
135
                       'subdir/b\n'
134
136
                       , '--from-root')
135
 
        self.ls_equals('subdir/b\0'
 
137
        self.ls_equals('.bzrignore\0'
 
138
                       'a\0'
 
139
                       'subdir\0'
 
140
                       'subdir/b\0'
136
141
                       , '--from-root --null')
137
 
        self.ls_equals('subdir/b\n'
 
142
        self.ls_equals('.bzrignore\n'
 
143
                       'a\n'
 
144
                       'subdir/\n'
138
145
                       , '--from-root', recursive=False)
139
146
 
140
147
    def test_ls_path(self):