/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/test_generate_docs.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:
bzrlib/tests/test_generate_docs.py
22
22
 
23
23
from cStringIO import StringIO
24
24
 
25
 
import bzrlib.commands
26
25
from bzrlib.tests import TestCase, TestSkipped
27
26
 
28
27
 
38
37
        self.sio = StringIO()
39
38
        self.options = Options()
40
39
        self.options.bzr_name = 'bzr'
41
 
        bzrlib.commands.install_bzr_command_hooks()
42
40
 
43
41
    def test_man_page(self):
44
 
        from bzrlib.doc_generate import autodoc_man
 
42
        try:
 
43
            from tools.doc_generate import autodoc_man
 
44
        except ImportError:
 
45
            raise TestSkipped('The package "tools" is not available to test.')
45
46
 
46
47
        autodoc_man.infogen(self.options, self.sio)
47
48
        self.assertNotEqual('', self.sio.getvalue())
48
49
 
49
50
    def test_rstx_man(self):
50
 
        from bzrlib.doc_generate import autodoc_rstx
 
51
        try:
 
52
            from tools.doc_generate import autodoc_rstx
 
53
        except ImportError:
 
54
            raise TestSkipped('The package "tools" is not available to test.')
51
55
 
52
56
        autodoc_rstx.infogen(self.options, self.sio)
53
57
        self.assertNotEqual('', self.sio.getvalue())