/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: John Arbash Meinel
  • Date: 2008-05-19 21:35:52 UTC
  • mto: This revision was merged to the branch mainline in revision 3441.
  • Revision ID: john@arbash-meinel.com-20080519213552-8jc1yc4w8rqhgzri
switch find_unmerged to use the new function

The api is very compatible, so we don't really need to expose a new function.
So make it hidden, and leave find_unmerged to take out the write lock and call it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_generate_docs.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for generating docs (man pages).
18
18
 
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
 
34
33
class TestGenerateDocs(TestCase):
35
34
 
36
35
    def setUp(self):
37
 
        TestCase.setUp(self)
38
36
        self.sio = StringIO()
39
37
        self.options = Options()
40
38
        self.options.bzr_name = 'bzr'
41
 
        bzrlib.commands.install_bzr_command_hooks()
42
39
 
43
40
    def test_man_page(self):
44
 
        from bzrlib.doc_generate import autodoc_man
 
41
        try:
 
42
            from tools.doc_generate import autodoc_man
 
43
        except ImportError:
 
44
            raise TestSkipped('The package "tools" is not available to test.')
45
45
 
46
46
        autodoc_man.infogen(self.options, self.sio)
47
47
        self.assertNotEqual('', self.sio.getvalue())
48
48
 
49
49
    def test_rstx_man(self):
50
 
        from bzrlib.doc_generate import autodoc_rstx
 
50
        try:
 
51
            from tools.doc_generate import autodoc_rstx
 
52
        except ImportError:
 
53
            raise TestSkipped('The package "tools" is not available to test.')
51
54
 
52
55
        autodoc_rstx.infogen(self.options, self.sio)
53
56
        self.assertNotEqual('', self.sio.getvalue())