← 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: John Arbash Meinel
  • Date: 2012-09-19 07:58:27 UTC
  • mfrom: (6437.63.9 2.5)
  • mto: This revision was merged to the branch mainline in revision 6563.
  • Revision ID: john@arbash-meinel.com-20120919075827-36b2b042kiaps0d3
Merge bzr-2.5.2 into trunk to get the fixes for ConnectionReset.

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)
 
42
            raise TestNotApplicable("format %s doesn't support views" % fmt)
43
43
        super(TestTreeViews, self).setUp()
44
44
 
45
45
    def test_views_initially_empty(self):