← Back to branch summary

~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-10-31 21:29:02 UTC
  • mfrom: (2104 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2110.
  • Revision ID: john@arbash-meinel.com-20061031212902-4b33920b90e9ce92
[merge] bzr.dev 2104

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_too_much.py
1
 
# Copyright (C) 2005 by Canonical Ltd
 
1
# Copyright (C) 2005 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
40
40
import sys
41
41
 
42
42
import bzrlib
 
43
from bzrlib import (
 
44
    osutils,
 
45
    )
43
46
from bzrlib.branch import Branch
44
 
import bzrlib.bzrdir as bzrdir
45
47
from bzrlib.errors import BzrCommandError
46
48
from bzrlib.osutils import (
47
49
    has_symlinks,
48
50
    pathjoin,
49
 
    rmtree,
50
51
    terminal_width,
51
52
    )
52
53
from bzrlib.tests.HTTPTestUtil import TestCaseWithWebserver
208
209
        self.runbzr('pull')
209
210
        self.runbzr('pull ../c')
210
211
        self.runbzr('branch ../c ../d')
211
 
        rmtree('../c')
 
212
        osutils.rmtree('../c')
212
213
        self.runbzr('pull')
213
214
        os.chdir('../b')
214
215
        self.runbzr('pull')