~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2006-05-10 19:59:55 UTC
  • mfrom: (1704 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1752.
  • Revision ID: john@arbash-meinel.com-20060510195955-df080afb1daa3a96
[merge] bzr.dev 1704

Show diffs side-by-side

added added

removed removed

Lines of Context:
37
37
from cStringIO import StringIO
38
38
import os
39
39
import re
40
 
import shutil
41
40
import sys
42
41
 
43
42
import bzrlib
44
43
from bzrlib.branch import Branch
45
44
import bzrlib.bzrdir as bzrdir
46
45
from bzrlib.errors import BzrCommandError
47
 
from bzrlib.osutils import has_symlinks, pathjoin
 
46
from bzrlib.osutils import has_symlinks, pathjoin, rmtree
48
47
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
49
48
from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
50
49
from bzrlib.tests.blackbox import ExternalBase
491
490
        self.runbzr('pull')
492
491
        self.runbzr('pull ../c')
493
492
        self.runbzr('branch ../c ../d')
494
 
        shutil.rmtree('../c')
 
493
        rmtree('../c')
495
494
        self.runbzr('pull')
496
495
        os.chdir('../b')
497
496
        self.runbzr('pull')