← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__groupcompress.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__groupcompress.py
23
23
from bzrlib.tests.scenarios import (
24
24
    load_tests_apply_scenarios,
25
25
    )
 
26
from bzrlib.tests import (
 
27
    features,
 
28
    )
26
29
 
27
30
 
28
31
def module_scenarios():
57
60
load_tests = load_tests_apply_scenarios
58
61
 
59
62
 
60
 
compiled_groupcompress_feature = tests.ModuleAvailableFeature(
61
 
                                    'bzrlib._groupcompress_pyx')
 
63
compiled_groupcompress_feature = features.ModuleAvailableFeature(
 
64
    'bzrlib._groupcompress_pyx')
62
65
 
63
66
_text1 = """\
64
67
This is a bit