← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_generate_docs.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-01-14 00:01:32 UTC
  • mfrom: (4957.1.1 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100114000132-3p3rabnonjw3gzqb
(jam) Merge bzr.stable, bringing in bug fixes #175839, #504390

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