← 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: John Arbash Meinel
  • Date: 2011-01-12 21:27:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5605.
  • Revision ID: john@arbash-meinel.com-20110112212700-esqmtrmevddxrsq2
Clean up the test slightly, hoping to avoid race conditions, update NEWS

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 import (
31
 
    scenarios,
32
 
    script,
33
 
    )
34
 
 
35
 
 
36
 
load_tests = scenarios.load_tests_apply_scenarios
 
30
from bzrlib.tests.scenarios import load_tests_apply_scenarios
 
31
 
 
32
 
 
33
load_tests = load_tests_apply_scenarios
37
34
 
38
35
 
39
36
class TestSendMixin(object):
349
346
 
350
347
 
351
348
class TestSendStrictWithChanges(tests.TestCaseWithTransport,
352
 
                                TestSendStrictMixin):
 
349
                                   TestSendStrictMixin):
353
350
 
354
351
    # These are textually the same as test_push.strict_push_change_scenarios,
355
352
    # but since the functions are reimplemented here, the definitions are left