← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2010-04-08 04:34:03 UTC
  • mfrom: (5138 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5139.
  • Revision ID: robertc@robertcollins.net-20100408043403-56z0d07vdqrx7f3t
Update bugfix for 528114 to trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_outside_wt.py
36
36
        tmp_dir = osutils.realpath(osutils.mkdtemp())
37
37
        # We expect a read-to-root attempt to occur.
38
38
        self.permit_url('file:///')
39
 
        self.addCleanup(lambda: osutils.rmtree(tmp_dir))
 
39
        self.addCleanup(osutils.rmtree, tmp_dir)
40
40
        out, err = self.run_bzr('log', retcode=3, working_dir=tmp_dir)
41
41
        self.assertEqual(u'bzr: ERROR: Not a branch: "%s/".\n'
42
42
                         % (tmp_dir,),
57
57
        # false and may cause test failures).
58
58
        # Watch out for tricky test dir (on OSX /tmp -> /private/tmp)
59
59
        tmp_dir = osutils.realpath(osutils.mkdtemp())
60
 
        self.addCleanup(lambda: osutils.rmtree(tmp_dir))
 
60
        self.addCleanup(osutils.rmtree, tmp_dir)
61
61
        # We expect a read-to-root attempt to occur.
62
62
        self.permit_url('file:///')
63
63
        expected_error = u'bzr: ERROR: Not a branch: "%s/branch2/".\n' % tmp_dir