← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_send.py

  • Committer: Vincent Ladeuil
  • Date: 2011-05-26 20:30:53 UTC
  • mfrom: (5920 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5924.
  • Revision ID: v.ladeuil+lp@free.fr-20110526203053-hbjn6yuzwg03wnuv
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_send.py
27
27
    )
28
28
from bzrlib.bundle import serializer
29
29
from bzrlib.transport import memory
30
 
from bzrlib.tests.scenarios import load_tests_apply_scenarios
31
 
 
32
 
 
33
 
load_tests = load_tests_apply_scenarios
 
30
from bzrlib.tests import (
 
31
    scenarios,
 
32
    script,
 
33
    )
 
34
 
 
35
 
 
36
load_tests = scenarios.load_tests_apply_scenarios
34
37
 
35
38
 
36
39
class TestSendMixin(object):
346
349
 
347
350
 
348
351
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
349
 
                                   TestSendStrictMixin):
 
352
                                TestSendStrictMixin):
350
353
 
351
354
    # These are textually the same as test_push.strict_push_change_scenarios,
352
355
    # but since the functions are reimplemented here, the definitions are left