--- a/tests/hghave Thu Aug 09 12:35:10 2007 -0700
+++ b/tests/hghave Thu Aug 09 23:29:29 2007 +0200
@@ -8,6 +8,8 @@
import sys
import tempfile
+tempprefix = 'hg-hghave-'
+
def has_symlink():
return hasattr(os, "symlink")
@@ -15,7 +17,7 @@
return hasattr(os, "mkfifo")
def has_executablebit():
- fd, path = tempfile.mkstemp()
+ fd, path = tempfile.mkstemp(prefix=tempprefix)
os.close(fd)
try:
s = os.lstat(path).st_mode
@@ -26,7 +28,7 @@
def has_eol_in_paths():
try:
- fd, path = tempfile.mkstemp(suffix='\n\r')
+ fd, path = tempfile.mkstemp(prefix=tempprefix, suffix='\n\r')
os.close(fd)
os.remove(path)
return True
--- a/tests/test-no-symlinks Thu Aug 09 12:35:10 2007 -0700
+++ b/tests/test-no-symlinks Thu Aug 09 23:29:29 2007 +0200
@@ -12,13 +12,13 @@
# ln -s a a.lnk
# ln -s d/b d/b.lnk
# hg ci -Am t
-# hg bundle --base null ../test-no-symlinks.bundle
+# hg bundle --base null ../test-no-symlinks.hg
# Extract a symlink on a platform not supporting them
echo % unbundle
hg init t
cd t
-hg pull "$TESTDIR/test-no-symlinks.bundle"
+hg pull "$TESTDIR/test-no-symlinks.hg"
hg update
cat a.lnk && echo
@@ -34,12 +34,12 @@
# Bundle and extract again
echo % bundle
-hg bundle --base null ../symlinks.bundle
+hg bundle --base null ../symlinks.hg
cd ..
hg init t2
cd t2
-hg pull ../symlinks.bundle
+hg pull ../symlinks.hg
hg update
cat a.lnk && echo
Binary file tests/test-no-symlinks.bundle has changed
Binary file tests/test-no-symlinks.hg has changed
--- a/tests/test-no-symlinks.out Thu Aug 09 12:35:10 2007 -0700
+++ b/tests/test-no-symlinks.out Thu Aug 09 23:29:29 2007 +0200
@@ -1,5 +1,5 @@
% unbundle
-pulling from C:\dev\mercurial\hg\hg-local-stable\tests/test-no-symlinks.bundle
+pulling from C:\dev\mercurial\hg\hg-local-stable\tests/test-no-symlinks.hg
requesting all changes
adding changesets
adding manifests
@@ -13,7 +13,7 @@
a
d/b
% bundle
-pulling from ../symlinks.bundle
+pulling from ../symlinks.hg
requesting all changes
adding changesets
adding manifests