← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test__known_graph.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil, Patch Queue Manager, Jelmer Vernooij
  • Date: 2017-01-17 16:20:41 UTC
  • mfrom: (6619.1.2 trunk)
  • Revision ID: tarmac-20170117162041-oo62uk1qsmgc9j31
Merge 2.7 into trunk including fixes for bugs #1622039, #1644003, #1579093 and #1645017. [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test__known_graph.py
26
26
from bzrlib.tests import test_graph
27
27
from bzrlib.revision import NULL_REVISION
28
28
from bzrlib.tests.scenarios import load_tests_apply_scenarios
 
29
from bzrlib.tests import (
 
30
    features,
 
31
    )
29
32
 
30
33
 
31
34
def caching_scenarios():
52
55
load_tests = load_tests_apply_scenarios
53
56
 
54
57
 
55
 
compiled_known_graph_feature = tests.ModuleAvailableFeature(
 
58
compiled_known_graph_feature = features.ModuleAvailableFeature(
56
59
    'bzrlib._known_graph_pyx')
57
60
 
58
61