← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/test_lp_api.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:
bzrlib/plugins/launchpad/test_lp_api.py
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
from bzrlib import commands, config, errors, osutils
19
 
from bzrlib.plugins.launchpad import cmd_launchpad_mirror
 
18
from bzrlib import config, errors, osutils
20
19
from bzrlib.tests import (
21
 
    ModuleAvailableFeature,
22
20
    TestCase,
23
21
    TestCaseWithTransport,
24
22
    )
 
23
from bzrlib.tests.features import (
 
24
    ModuleAvailableFeature,
 
25
    )
25
26
 
26
27
 
27
28
launchpadlib_feature = ModuleAvailableFeature('launchpadlib')
33
34
    _test_needs_features = [launchpadlib_feature]
34
35
 
35
36
    def setUp(self):
36
 
        TestCase.setUp(self)
 
37
        super(TestDependencyManagement, self).setUp()
37
38
        from bzrlib.plugins.launchpad import lp_api
38
39
        self.lp_api = lp_api
39
40