Rev 3669: (vila, verterok) Fix some OSX failing tests in file:///home/pqm/archives/thelove/bzr/%2Btrunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Mon Sep 1 07:53:26 BST 2008
At file:///home/pqm/archives/thelove/bzr/%2Btrunk/
------------------------------------------------------------
revno: 3669
revision-id: pqm at pqm.ubuntu.com-20080901065318-3r92nk175nbu54dw
parent: pqm at pqm.ubuntu.com-20080830091000-3oibqwlrxvdpgo5l
parent: v.ladeuil+lp at free.fr-20080901061929-hqd7szgqkdm0k4qu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-09-01 07:53:18 +0100
message:
(vila, verterok) Fix some OSX failing tests
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3668.1.1
revision-id: v.ladeuil+lp at free.fr-20080901061929-hqd7szgqkdm0k4qu
parent: pqm at pqm.ubuntu.com-20080830091000-3oibqwlrxvdpgo5l
parent: v.ladeuil+lp at free.fr-20080901061607-dgqfeswfmaeouvjp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: trunk
timestamp: Mon 2008-09-01 08:19:29 +0200
message:
Fix some OSX failing tests
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3638.3.7
revision-id: v.ladeuil+lp at free.fr-20080901061607-dgqfeswfmaeouvjp
parent: v.ladeuil+lp at free.fr-20080831191908-l4ke1ttjj61sit76
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Mon 2008-09-01 08:16:07 +0200
message:
Fix PEP8.
modified:
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
------------------------------------------------------------
revno: 3638.3.6
revision-id: v.ladeuil+lp at free.fr-20080831191908-l4ke1ttjj61sit76
parent: v.ladeuil+lp at free.fr-20080831190607-m5kmikqnn4ssyt0f
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Sun 2008-08-31 21:19:08 +0200
message:
Isolate group sticky bit related tests.
* bzrlib/tests/test_permissions.py:
(TestPermissions.test_new_files_group_sticky_bit): Spliited out
from test_new_files for better defect localization.
* bzrlib/tests/branch_implementations/test_permissions.py:
(TestPermissions.test_new_branch_group_sticky_bit): Splitted out
from test_new_branch for better defect localization.
modified:
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
------------------------------------------------------------
revno: 3638.3.5
revision-id: v.ladeuil+lp at free.fr-20080831190607-m5kmikqnn4ssyt0f
parent: v.ladeuil+lp at free.fr-20080826164412-glyk2qaoyzb8zql5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Sun 2008-08-31 21:06:07 +0200
message:
John's review feebdack: don't call chown unconditionally.
* bzrlib/tests/__init__.py:
(_CaseInsensitiveFilesystemFeature): Drive-py typo fix.
* bzrlib/osutils.py:
(_mac_mkdtemp): Deleted, we don't to call chown for every temp dir
creation.
* bzrlib/tests/test_permissions.py:
(TestPermissions.test_new_files): Only this test needs a chown to
pass on darwin.
* bzrlib/tests/branch_implementations/test_permissions.py:
(TestPermissions.test_new_branch): Only this test needs a chown to
pass on darwin.
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/test_permissions.py test_permissions.py-20051215004520-ccf475789c80e80c
------------------------------------------------------------
revno: 3638.3.4
revision-id: v.ladeuil+lp at free.fr-20080826164412-glyk2qaoyzb8zql5
parent: v.ladeuil+lp at free.fr-20080826131330-xgh1m6v9i2636jw0
parent: pqm at pqm.ubuntu.com-20080826151717-xb3qgwv6xta124k7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Tue 2008-08-26 18:44:12 +0200
message:
merge bzr.dev at 3650
removed:
tools/win32/survey.txt survey.txt-20070809075950-sf265mgu9oog8jjb-1
added:
bzrlib/_btree_serializer_c.pyx _parse_btree_c.pyx-20080703034413-3q25bklkenti3p8p-2
bzrlib/_btree_serializer_py.py _parse_btree_py.py-20080703034413-3q25bklkenti3p8p-3
bzrlib/btree_index.py index.py-20080624222253-p0x5f92uyh5hw734-7
bzrlib/chunk_writer.py chunk_writer.py-20080630234519-6ggn4id17nipovny-1
bzrlib/tests/test_btree_index.py test_index.py-20080624222253-p0x5f92uyh5hw734-13
bzrlib/tests/test_chunk_writer.py test_chunk_writer.py-20080630234519-6ggn4id17nipovny-2
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/branch_implementations/test_permissions.py test_permissions.py-20060210110243-245c01403bf0fde6
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/es/mini-tutorial/index.txt index.txt-20080504182136-wmoc35u2t6kom8ca-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3638.3.3
revision-id: v.ladeuil+lp at free.fr-20080826131330-xgh1m6v9i2636jw0
parent: v.ladeuil+lp at free.fr-20080826082527-109yyxzc0u24oeel
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Tue 2008-08-26 15:13:30 +0200
message:
OSX too needs to accept 'bzr mv foo Foo' when foo and Foo are the same file.
* bzrlib/workingtree.py:
(WorkingTree._determine_mv_mode): Case sensitivity is what matter
here, it exists outside of win32 (i.e. OSX).
modified:
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3638.3.2
revision-id: v.ladeuil+lp at free.fr-20080826082527-109yyxzc0u24oeel
parent: guillo.gonzo at gmail.com-20080816184333-51of2k7wqi6nwtjo
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: osx_tests_fix
timestamp: Tue 2008-08-26 10:25:27 +0200
message:
Fix all calls to tempfile.mkdtemp to osutils.mkdtemp.
* bzrlib/transform.py:
(TransformPreview.__init__): Use osutils.mkdtemp instead of
tempfile.mkdtemp.
* bzrlib/tests/test_whitebox.py:
(MoreTests.test_relpath): Use osutils.mkdtemp instead of
tempfile.mkdtemp.
* bzrlib/tests/test_setup.py:
(TestSetup.test_build_and_install): Use osutils.mkdtemp instead of
tempfile.mkdtemp.
* bzrlib/tests/test_bundle.py:
(BundleTester.get_checkout): Use osutils.mkdtemp instead of
tempfile.mkdtemp.
* bzrlib/tests/blackbox/test_outside_wt.py:
(TestOutsideWT.test_cwd_log,
TestOutsideWT.test_diff_outside_tree): Use osutils.mkdtemp instead
of tempfile.mkdtemp.
* bzrlib/smart/repository.py:
(SmartServerRepositoryTarball._copy_to_tempdir): Use
osutils.mkdtemp instead of tempfile.mkdtemp.
(SmartServerRepositoryTarball._tarfile_response): Line too long.
* bzrlib/remote.py:
(RemoteRepository._copy_repository_tarball): Use osutils.mkdtemp
instead of tempfile.mkdtemp.
* bzrlib/osutils.py:
(_mac_mkdtemp): Add docstring.
* bzrlib/mail_client.py:
(ExternalMailClient.compose): Use osutils.mkdtemp instead of
tempfile.mkdtemp.
* bzrlib/diff.py:
(DiffFromTool.__init__): Use osutils.mkdtemp instead of
tempfile.mkdtemp.
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_setup.py test_setup.py-20051208073730-4a59a6368c4efa04
bzrlib/tests/test_whitebox.py whitebox.py-20050530064534-a063aafb4a0a3a04
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3638.3.1
revision-id: guillo.gonzo at gmail.com-20080816184333-51of2k7wqi6nwtjo
parent: pqm at pqm.ubuntu.com-20080816000954-t0401ff8s3ydnkr6
committer: Guillermo Gonzalez <guillo.gonzo at gmail.com>
branch nick: osx_tests_fix
timestamp: Sat 2008-08-16 15:43:33 -0300
message:
added _mac_mkdtemp, that chown tmp dir.
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
=== modified file 'bzrlib/diff.py'
--- a/bzrlib/diff.py 2008-08-14 05:29:02 +0000
+++ b/bzrlib/diff.py 2008-08-26 08:25:27 +0000
@@ -682,7 +682,7 @@
path_encoding='utf-8'):
DiffPath.__init__(self, old_tree, new_tree, to_file, path_encoding)
self.command_template = command_template
- self._root = tempfile.mkdtemp(prefix='bzr-diff-')
+ self._root = osutils.mkdtemp(prefix='bzr-diff-')
@classmethod
def from_string(klass, command_string, old_tree, new_tree, to_file,
=== modified file 'bzrlib/mail_client.py'
--- a/bzrlib/mail_client.py 2008-08-19 19:49:06 +0000
+++ b/bzrlib/mail_client.py 2008-08-26 16:44:12 +0000
@@ -135,7 +135,7 @@
"""
if basename is None:
basename = 'attachment'
- pathname = tempfile.mkdtemp(prefix='bzr-mail-')
+ pathname = osutils.mkdtemp(prefix='bzr-mail-')
attach_path = osutils.pathjoin(pathname, basename + extension)
outfile = open(attach_path, 'wb')
try:
=== modified file 'bzrlib/remote.py'
--- a/bzrlib/remote.py 2008-08-28 21:24:49 +0000
+++ b/bzrlib/remote.py 2008-09-01 06:19:29 +0000
@@ -1039,7 +1039,6 @@
# destination
from bzrlib import osutils
import tarfile
- import tempfile
# TODO: Maybe a progress bar while streaming the tarball?
note("Copying repository content as tarball...")
tar_file = self._get_tarball('bz2')
@@ -1049,7 +1048,7 @@
try:
tar = tarfile.open('repository', fileobj=tar_file,
mode='r|bz2')
- tmpdir = tempfile.mkdtemp()
+ tmpdir = osutils.mkdtemp()
try:
_extract_tar(tar, tmpdir)
tmp_bzrdir = BzrDir.open(tmpdir)
=== modified file 'bzrlib/smart/repository.py'
--- a/bzrlib/smart/repository.py 2008-06-25 22:27:57 +0000
+++ b/bzrlib/smart/repository.py 2008-08-26 08:25:27 +0000
@@ -23,7 +23,10 @@
import tempfile
import tarfile
-from bzrlib import errors
+from bzrlib import (
+ errors,
+ osutils,
+ )
from bzrlib.bzrdir import BzrDir
from bzrlib.pack import ContainerSerialiser
from bzrlib.smart.request import (
@@ -357,7 +360,7 @@
osutils.rmtree(tmp_dirname)
def _copy_to_tempdir(self, from_repo):
- tmp_dirname = tempfile.mkdtemp(prefix='tmpbzrclone')
+ tmp_dirname = osutils.mkdtemp(prefix='tmpbzrclone')
tmp_bzrdir = from_repo.bzrdir._format.initialize(tmp_dirname)
tmp_repo = from_repo._format.initialize(tmp_bzrdir)
from_repo.copy_content_into(tmp_repo)
@@ -370,8 +373,8 @@
# all finished; write the tempfile out to the network
temp.seek(0)
return SuccessfulSmartServerResponse(('ok',), temp.read())
- # FIXME: Don't read the whole thing into memory here; rather stream it
- # out from the file onto the network. mbp 20070411
+ # FIXME: Don't read the whole thing into memory here; rather stream
+ # it out from the file onto the network. mbp 20070411
finally:
temp.close()
=== modified file 'bzrlib/tests/__init__.py'
--- a/bzrlib/tests/__init__.py 2008-08-30 08:35:35 +0000
+++ b/bzrlib/tests/__init__.py 2008-09-01 06:19:29 +0000
@@ -3289,7 +3289,7 @@
class _CaseInsensitiveFilesystemFeature(Feature):
- """Check if underlined filesystem is case-insensitive
+ """Check if underlying filesystem is case-insensitive
(e.g. on Windows, Cygwin, MacOS)
"""
=== modified file 'bzrlib/tests/blackbox/test_outside_wt.py'
--- a/bzrlib/tests/blackbox/test_outside_wt.py 2008-01-29 11:53:31 +0000
+++ b/bzrlib/tests/blackbox/test_outside_wt.py 2008-08-26 08:25:27 +0000
@@ -19,7 +19,6 @@
"""Black-box tests for running bzr outside of a working tree."""
import os
-import tempfile
from bzrlib import (
osutils,
@@ -32,7 +31,7 @@
"""Test that bzr gives proper errors outside of a working tree."""
def test_cwd_log(self):
- tmp_dir = tempfile.mkdtemp()
+ tmp_dir = osutils.mkdtemp()
self.addCleanup(lambda: osutils.rmtree(tmp_dir))
os.chdir(tmp_dir)
out, err = self.run_bzr('log', retcode=3)
@@ -47,7 +46,7 @@
u' "%s".\n' % url, err)
def test_diff_outside_tree(self):
- tmp_dir = tempfile.mkdtemp()
+ tmp_dir = osutils.mkdtemp()
self.addCleanup(lambda: osutils.rmtree(tmp_dir))
os.chdir(tmp_dir)
self.run_bzr('init branch1')
=== modified file 'bzrlib/tests/branch_implementations/test_permissions.py'
--- a/bzrlib/tests/branch_implementations/test_permissions.py 2008-08-21 16:12:57 +0000
+++ b/bzrlib/tests/branch_implementations/test_permissions.py 2008-08-31 19:19:08 +0000
@@ -74,6 +74,31 @@
self.assertEqualMode(mode, b.control_files._dir_mode)
self.assertEqualMode(mode & ~07111, b.control_files._file_mode)
+ os.mkdir('d')
+ os.chmod('d', 0700)
+ b = self.make_branch('d')
+ self.assertEqualMode(0700, b.bzrdir._get_dir_mode())
+ self.assertEqualMode(0600, b.bzrdir._get_file_mode())
+ self.assertEqualMode(0700, b.control_files._dir_mode)
+ self.assertEqualMode(0600, b.control_files._file_mode)
+ check_mode_r(self, 'd/.bzr', 00600, 00700)
+
+ def test_new_branch_group_sticky_bit(self):
+ if isinstance(self.branch_format, RemoteBranchFormat):
+ # Remote branch format have no permission logic in them; there's
+ # nothing to test here.
+ raise tests.TestNotApplicable('Remote branches have no'
+ ' permission logic')
+ if sys.platform == 'win32':
+ raise tests.TestNotApplicable('chmod has no effect on win32')
+ elif sys.platform == 'darwin':
+ # OS X creates temp dirs with the 'wheel' group, which users are
+ # not likely to be in, and this prevents us from setting the sgid
+ # bit
+ os.chown(self.test_dir, os.getuid(), os.getgid())
+ # also, these are BzrBranch format specific things..
+ t = self.make_branch_and_tree('.')
+ b = t.branch
os.mkdir('b')
os.chmod('b', 02777)
b = self.make_branch('b')
@@ -92,15 +117,6 @@
self.assertEqualMode(00640, b.control_files._file_mode)
check_mode_r(self, 'c/.bzr', 00640, 02750)
- os.mkdir('d')
- os.chmod('d', 0700)
- b = self.make_branch('d')
- self.assertEqualMode(0700, b.bzrdir._get_dir_mode())
- self.assertEqualMode(0600, b.bzrdir._get_file_mode())
- self.assertEqualMode(0700, b.control_files._dir_mode)
- self.assertEqualMode(0600, b.control_files._file_mode)
- check_mode_r(self, 'd/.bzr', 00600, 00700)
-
def test_mode_0(self):
"""Test when a transport returns null permissions for .bzr"""
if isinstance(self.branch_format, RemoteBranchFormat):
=== modified file 'bzrlib/tests/test_bundle.py'
--- a/bzrlib/tests/test_bundle.py 2008-06-11 04:20:16 +0000
+++ b/bzrlib/tests/test_bundle.py 2008-08-26 08:25:27 +0000
@@ -17,12 +17,12 @@
from cStringIO import StringIO
import os
import sys
-import tempfile
from bzrlib import (
bzrdir,
errors,
inventory,
+ osutils,
repository,
revision as _mod_revision,
treebuilder,
@@ -455,7 +455,7 @@
"""
if checkout_dir is None:
- checkout_dir = tempfile.mkdtemp(prefix='test-branch-', dir='.')
+ checkout_dir = osutils.mkdtemp(prefix='test-branch-', dir='.')
else:
if not os.path.exists(checkout_dir):
os.mkdir(checkout_dir)
=== modified file 'bzrlib/tests/test_permissions.py'
--- a/bzrlib/tests/test_permissions.py 2008-05-21 03:05:59 +0000
+++ b/bzrlib/tests/test_permissions.py 2008-09-01 06:16:07 +0000
@@ -29,7 +29,7 @@
# TODO: jam 20051215 Currently the default behavior for 'bzr branch' is just
# defined by the local umask. This isn't terrible, is it
# the truly desired behavior?
-
+
import os
import sys
import stat
@@ -138,6 +138,18 @@
t.commit('new c')
check_mode_r(self, '.bzr', 0664, 0775)
+ def test_new_files_group_sticky_bit(self):
+ if sys.platform == 'win32':
+ raise TestSkipped('chmod has no effect on win32')
+ elif sys.platform == 'darwin':
+ # OS X creates temp dirs with the 'wheel' group, which users are
+ # not likely to be in, and this prevents us from setting the sgid
+ # bit
+ os.chown(self.test_dir, os.getuid(), os.getgid())
+
+ t = self.make_branch_and_tree('.')
+ b = t.branch
+
# Test the group sticky bit
# Recursively update the modes of all files
chmod_r('.bzr', 0664, 02775)
=== modified file 'bzrlib/tests/test_setup.py'
--- a/bzrlib/tests/test_setup.py 2006-10-11 23:08:27 +0000
+++ b/bzrlib/tests/test_setup.py 2008-08-26 08:25:27 +0000
@@ -20,7 +20,6 @@
import sys
import subprocess
import shutil
-import tempfile
from tempfile import TemporaryFile
import bzrlib
@@ -56,7 +55,7 @@
raise TestSkipped('You must have distutils installed to run this test.'
' Usually this can be found by installing "python-dev"')
self.log('test_build running in %s' % os.getcwd())
- install_dir = tempfile.mkdtemp()
+ install_dir = osutils.mkdtemp()
# setup.py must be run from the root source directory, but the tests
# are not necessarily invoked from there
self.source_dir = os.path.dirname(os.path.dirname(bzrlib.__file__))
=== modified file 'bzrlib/tests/test_whitebox.py'
--- a/bzrlib/tests/test_whitebox.py 2006-10-16 01:25:46 +0000
+++ b/bzrlib/tests/test_whitebox.py 2008-08-26 08:25:27 +0000
@@ -36,15 +36,15 @@
if it is inside a branch and return the path relative to the base.
"""
import tempfile
-
+
savedir = os.getcwdu()
- dtmp = tempfile.mkdtemp()
+ dtmp = osutils.mkdtemp()
# On Mac OSX, /tmp actually expands to /private/tmp
dtmp = realpath(dtmp)
def rp(p):
return relpath(dtmp, p)
-
+
try:
# check paths inside dtmp while standing outside it
self.assertEqual(rp(pathjoin(dtmp, 'foo')), 'foo')
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py 2008-08-29 02:15:55 +0000
+++ b/bzrlib/transform.py 2008-09-01 06:19:29 +0000
@@ -17,7 +17,6 @@
import os
import errno
from stat import S_ISREG, S_IEXEC
-import tempfile
from bzrlib.lazy_import import lazy_import
lazy_import(globals(), """
@@ -1408,7 +1407,7 @@
def __init__(self, tree, pb=DummyProgress(), case_sensitive=True):
tree.lock_read()
- limbodir = tempfile.mkdtemp(prefix='bzr-limbo-')
+ limbodir = osutils.mkdtemp(prefix='bzr-limbo-')
TreeTransformBase.__init__(self, tree, limbodir, pb, case_sensitive)
def canonical_path(self, path):
More information about the bazaar-commits
mailing list