← 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: 2009-09-22 04:25:05 UTC
  • mfrom: (4708 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4710.
  • Revision ID: robertc@robertcollins.net-20090922042505-bo5m0b5uuajl2igj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_outside_wt.py
32
32
    """Test that bzr gives proper errors outside of a working tree."""
33
33
 
34
34
    def test_cwd_log(self):
35
 
        tmp_dir = osutils.mkdtemp()
 
35
        # Watch out for tricky test dir (on OSX /tmp -> /private/tmp)
 
36
        tmp_dir = osutils.realpath(osutils.mkdtemp())
36
37
        # We expect a read-to-root attempt to occur.
37
38
        self.permit_url('file:///')
38
39
        self.addCleanup(lambda: osutils.rmtree(tmp_dir))
54
55
        # A directory we can run commands from which we hope is not contained
55
56
        # in a bzr tree (though if there is one at or above $TEMPDIR, this is
56
57
        # false and may cause test failures).
57
 
        tmp_dir = osutils.mkdtemp()
 
58
        # Watch out for tricky test dir (on OSX /tmp -> /private/tmp)
 
59
        tmp_dir = osutils.realpath(osutils.mkdtemp())
58
60
        self.addCleanup(lambda: osutils.rmtree(tmp_dir))
59
61
        # We expect a read-to-root attempt to occur.
60
62
        self.permit_url('file:///')