/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 tools/capture_tree.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-08 13:39:32 UTC
  • mto: (4343.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4344.
  • Revision ID: v.ladeuil+lp@free.fr-20090508133932-4fbx4z8fvraeyjdy
Fixed as per John's and Markus reviews.

* bzrlib/tests/blackbox/test_push.py:
(TestPush.test_push_with_revisionspec): Fix wrong run_bzr_error
call. Additionnally the error regexp was wrong !

* bzrlib/tests/blackbox/test_ls.py:
(TestLS.test_ls_path, TestLS.test_kinds): Fix wrong run_bzr_error
calls.

* bzrlib/tests/__init__.py:
(TestCase.run_bzr): Add a check to catch errors in error_regexes
usage where people use a a string that it then iterated char by
char for matching (which is most certainly not the intent of the
test writer).

* bzrlib/tests/blackbox/test_log.py:
Fix run_bzr_error calls. Fix some white spaces issues (some
expected strings were using TABs and were wrongly caught by
test_coding_style(), but fixing the strings wasn't really a
problem either.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/capture_tree.py
 
1
#! /usr/bin/env python
 
2
 
 
3
# Copyright (C) 2005 Canonical Ltd
 
4
 
 
5
"""Print to stdout a description of the current directory, 
 
6
formatted as a Python data structure.
 
7
 
 
8
This can be useful in tests that need to recreate directory
 
9
contents."""
 
10
 
 
11
import sys
 
12
import os
 
13
 
 
14
from bzrlib.trace import enable_default_logging
 
15
enable_default_logging()
 
16
from bzrlib.selftest.treeshape import capture_tree_contents
 
17
 
 
18
def main(argv):
 
19
    # a lame reimplementation of pformat that splits multi-line
 
20
    # strings into concatenated string literals.
 
21
    print '['
 
22
    for tt in capture_tree_contents('.'):
 
23
        assert isinstance(tt, tuple)
 
24
        print '    (', repr(tt[0]) + ',',
 
25
        if len(tt) == 1:
 
26
            print '),'
 
27
        else:
 
28
            assert len(tt) == 2
 
29
            val = tt[1]
 
30
            print
 
31
            if val == '':
 
32
                print "        ''"
 
33
            else:
 
34
                for valline in val.splitlines(True):
 
35
                    print '       ', repr(valline)
 
36
            print '    ),'
 
37
    print ']'
 
38
 
 
39
if __name__ == '__main__':
 
40
    sys.exit(main(sys.argv))