← 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: Martin Pool
  • Date: 2010-07-21 09:58:42 UTC
  • mfrom: (4797.58.7 2.1)
  • mto: (5050.3.13 2.2)
  • mto: This revision was merged to the branch mainline in revision 5365.
  • Revision ID: mbp@canonical.com-20100721095842-hz0obu8gl0x05nty
merge up 2.1 to 2.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_generate_docs.py
41
41
        bzrlib.commands.install_bzr_command_hooks()
42
42
 
43
43
    def test_man_page(self):
44
 
        try:
45
 
            from tools.doc_generate import autodoc_man
46
 
        except ImportError:
47
 
            raise TestSkipped('The package "tools" is not available to test.')
 
44
        from bzrlib.doc_generate import autodoc_man
48
45
 
49
46
        autodoc_man.infogen(self.options, self.sio)
50
47
        self.assertNotEqual('', self.sio.getvalue())
51
48
 
52
49
    def test_rstx_man(self):
53
 
        try:
54
 
            from tools.doc_generate import autodoc_rstx
55
 
        except ImportError:
56
 
            raise TestSkipped('The package "tools" is not available to test.')
 
50
        from bzrlib.doc_generate import autodoc_rstx
57
51
 
58
52
        autodoc_rstx.infogen(self.options, self.sio)
59
53
        self.assertNotEqual('', self.sio.getvalue())