← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_views.py

  • Committer: Patch Queue Manager
  • Date: 2015-12-17 18:39:00 UTC
  • mfrom: (6606.1.2 fix-float)
  • Revision ID: pqm@pqm.ubuntu.com-20151217183900-0719du2uv1kwu3lc
(vila) Inline testtools private method to fix an issue in xenial (the
 private implementation has changed in an backward incompatible way).
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_views.py
22
22
 
23
23
 
24
24
from bzrlib import views, errors
25
 
from bzrlib.tests import TestSkipped
 
25
from bzrlib.tests import TestNotApplicable, TestSkipped
26
26
from bzrlib.workingtree import WorkingTree
27
27
 
28
28
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
39
39
            raise TestSkipped("format %s doesn't declare whether it "
40
40
                "supports views, assuming not" % fmt)
41
41
        if not f():
42
 
            raise TestSkipped("format %s doesn't support views" % fmt)
43
 
        TestCaseWithWorkingTree.setUp(self)
 
42
            raise TestNotApplicable("format %s doesn't support views" % fmt)
 
43
        super(TestTreeViews, self).setUp()
44
44
 
45
45
    def test_views_initially_empty(self):
46
46
        wt = self.make_branch_and_tree('wt')
172
172
            raise TestSkipped("Format %s declares that views are supported"
173
173
                              % fmt)
174
174
            # it's covered by TestTreeViews
175
 
        TestCaseWithWorkingTree.setUp(self)
 
175
        super(TestUnsupportedViews, self).setUp()
176
176
 
177
177
    def test_view_methods_raise(self):
178
178
        wt = self.make_branch_and_tree('wt')