~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_generate_docs.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2007 Canonical Ltd
 
1
# Copyright (C) 2007, 2009, 2011 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, TestSkipped
 
26
from bzrlib.tests import TestCase
27
27
 
28
28
 
29
29
class Options:
34
34
class TestGenerateDocs(TestCase):
35
35
 
36
36
    def setUp(self):
37
 
        TestCase.setUp(self)
 
37
        super(TestGenerateDocs, self).setUp()
38
38
        self.sio = StringIO()
39
39
        self.options = Options()
40
40
        self.options.bzr_name = 'bzr'