[PATCH 07 of 19] tests: use 'hghave symlink' for tests using symlinks
Mads Kiilerich
mads at kiilerich.com
Sun Nov 6 20:40:57 CST 2011
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1320632094 -3600
# Node ID 2e57375cc50744a487051a96e70531fedab7c2ee
# Parent 761672b9095d0ae87230c315189167b8e0f9c4cd
tests: use 'hghave symlink' for tests using symlinks
diff --git a/tests/hghave b/tests/hghave
--- a/tests/hghave
+++ b/tests/hghave
@@ -161,7 +161,7 @@
return matchoutput('p4 -V', r'Rev\. P4/') and matchoutput('p4d -V', r'Rev\. P4D/')
def has_symlink():
- return hasattr(os, "symlink")
+ return hasattr(os, "symlink") # FIXME: should also check file system and os
def has_tla():
return matchoutput('tla --version 2>&1', r'The GNU Arch Revision')
diff --git a/tests/test-audit-path.t b/tests/test-audit-path.t
--- a/tests/test-audit-path.t
+++ b/tests/test-audit-path.t
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
+
$ hg init
should fail
diff --git a/tests/test-commit.t b/tests/test-commit.t
--- a/tests/test-commit.t
+++ b/tests/test-commit.t
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
+
commit date test
$ hg init test
diff --git a/tests/test-convert-bzr.t b/tests/test-convert-bzr.t
--- a/tests/test-convert-bzr.t
+++ b/tests/test-convert-bzr.t
@@ -1,3 +1,4 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
$ . "$TESTDIR/bzr-definitions"
diff --git a/tests/test-convert-svn-sink.t b/tests/test-convert-svn-sink.t
--- a/tests/test-convert-svn-sink.t
+++ b/tests/test-convert-svn-sink.t
@@ -1,5 +1,4 @@
-
- $ "$TESTDIR/hghave" svn13 no-outer-repo || exit 80
+ $ "$TESTDIR/hghave" svn13 no-outer-repo symlink || exit 80
$ fixpath()
> {
diff --git a/tests/test-convert-tla.t b/tests/test-convert-tla.t
--- a/tests/test-convert-tla.t
+++ b/tests/test-convert-tla.t
@@ -1,5 +1,5 @@
- $ "$TESTDIR/hghave" tla || exit 80
+ $ "$TESTDIR/hghave" tla symlink || exit 80
$ tla my-id "mercurial <mercurial at selenic.com>"
$ echo "[extensions]" >> $HGRCPATH
$ echo "convert=" >> $HGRCPATH
diff --git a/tests/test-extdiff.t b/tests/test-extdiff.t
--- a/tests/test-extdiff.t
+++ b/tests/test-extdiff.t
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
+
$ echo "[extensions]" >> $HGRCPATH
$ echo "extdiff=" >> $HGRCPATH
diff --git a/tests/test-import-bypass.t b/tests/test-import-bypass.t
--- a/tests/test-import-bypass.t
+++ b/tests/test-import-bypass.t
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
+
$ echo "[extensions]" >> $HGRCPATH
$ echo "purge=" >> $HGRCPATH
$ echo "graphlog=" >> $HGRCPATH
diff --git a/tests/test-import-git.t b/tests/test-import-git.t
--- a/tests/test-import-git.t
+++ b/tests/test-import-git.t
@@ -1,3 +1,4 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
$ hg init
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
+
$ cat <<EOF >> $HGRCPATH
> [extensions]
> keyword =
diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
+
$ cat >> $HGRCPATH <<EOF
> [extensions]
> largefiles=
diff --git a/tests/test-manifest.t b/tests/test-manifest.t
--- a/tests/test-manifest.t
+++ b/tests/test-manifest.t
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
+
Source bundle was generated with the following script:
# hg init
diff --git a/tests/test-merge-symlinks.t b/tests/test-merge-symlinks.t
--- a/tests/test-merge-symlinks.t
+++ b/tests/test-merge-symlinks.t
@@ -1,3 +1,4 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
$ cat > echo.py <<EOF
> #!/usr/bin/env python
diff --git a/tests/test-merge-types.t b/tests/test-merge-types.t
--- a/tests/test-merge-types.t
+++ b/tests/test-merge-types.t
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
+
$ hg init
$ echo a > a
diff --git a/tests/test-rename.t b/tests/test-rename.t
--- a/tests/test-rename.t
+++ b/tests/test-rename.t
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
+
$ hg init
$ mkdir d1 d1/d11 d2
$ echo d1/a > d1/a
diff --git a/tests/test-symlink-placeholder.t b/tests/test-symlink-placeholder.t
--- a/tests/test-symlink-placeholder.t
+++ b/tests/test-symlink-placeholder.t
@@ -1,3 +1,5 @@
+ $ "$TESTDIR/hghave" symlink || exit 80
+
Create extension that can disable symlink support:
$ cat > nolink.py <<EOF
More information about the Mercurial-devel
mailing list