~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-12-02 14:58:47 UTC
  • mfrom: (5554.1.3 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20101202145847-fw822sd3nyhvrwmi
(vila) Merge 2.2 into trunk including fix for bug #583667 and bug
        #681885 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007, 2009, 2011 Canonical Ltd
 
1
# Copyright (C) 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
23
23
from cStringIO import StringIO
24
24
 
25
25
import bzrlib.commands
26
 
from bzrlib.tests import TestCase
 
26
from bzrlib.tests import TestCase, TestSkipped
27
27
 
28
28
 
29
29
class Options:
34
34
class TestGenerateDocs(TestCase):
35
35
 
36
36
    def setUp(self):
37
 
        super(TestGenerateDocs, self).setUp()
 
37
        TestCase.setUp(self)
38
38
        self.sio = StringIO()
39
39
        self.options = Options()
40
40
        self.options.bzr_name = 'bzr'