# HG changeset patch
# User Nicolas Dumazet <nicdumz.commits@gmail.com>
# Date 2011-04-30 15:38:06
# Node ID cd3032437064478a982882c575d860f3f9ee3f58
# Parent  1d5faa2c970ff45fc8906f9777f0a220c66c0f8e

tests: move test bundles in a bundles/ subdirectory

diff --git a/tests/darcs1.hg b/tests/bundles/darcs1.hg
rename from tests/darcs1.hg
rename to tests/bundles/darcs1.hg
diff --git a/tests/legacy-encoding.hg b/tests/bundles/legacy-encoding.hg
rename from tests/legacy-encoding.hg
rename to tests/bundles/legacy-encoding.hg
diff --git a/tests/tampered.hg b/tests/bundles/tampered.hg
rename from tests/tampered.hg
rename to tests/bundles/tampered.hg
diff --git a/tests/test-keyword.hg b/tests/bundles/test-keyword.hg
rename from tests/test-keyword.hg
rename to tests/bundles/test-keyword.hg
diff --git a/tests/test-manifest.hg b/tests/bundles/test-manifest.hg
rename from tests/test-manifest.hg
rename to tests/bundles/test-manifest.hg
diff --git a/tests/test-merge-symlinks.hg b/tests/bundles/test-merge-symlinks.hg
rename from tests/test-merge-symlinks.hg
rename to tests/bundles/test-merge-symlinks.hg
diff --git a/tests/test-no-symlinks.hg b/tests/bundles/test-no-symlinks.hg
rename from tests/test-no-symlinks.hg
rename to tests/bundles/test-no-symlinks.hg
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
@@ -33,7 +33,7 @@ unbundle tampered bundle
 
   $ hg init target
   $ cd target
-  $ hg unbundle $TESTDIR/tampered.hg
+  $ hg unbundle $TESTDIR/bundles/tampered.hg
   adding changesets
   adding manifests
   adding file changes
diff --git a/tests/test-convert-darcs.t b/tests/test-convert-darcs.t
--- a/tests/test-convert-darcs.t
+++ b/tests/test-convert-darcs.t
@@ -16,7 +16,7 @@ skip if we can't import elementtree
 
 try converting darcs1 repository
 
-  $ hg clone -q "$TESTDIR/darcs1.hg" darcs
+  $ hg clone -q "$TESTDIR/bundles/darcs1.hg" darcs
   $ hg convert -s darcs darcs/darcs1 2>&1 | grep darcs-1.0
   darcs-1.0 repository format is unsupported, please upgrade
 
diff --git a/tests/test-encoding.t b/tests/test-encoding.t
--- a/tests/test-encoding.t
+++ b/tests/test-encoding.t
@@ -5,7 +5,7 @@ Test character encoding
 
 we need a repo with some legacy latin-1 changesets
 
-  $ hg unbundle $TESTDIR/legacy-encoding.hg
+  $ hg unbundle $TESTDIR/bundles/legacy-encoding.hg
   adding changesets
   adding manifests
   adding file changes
diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -78,7 +78,7 @@ A bundle to test this was made with:
  hg ci -m addsym -u mercurial
  hg bundle --base null ../test-keyword.hg
 
-  $ hg pull -u "$TESTDIR"/test-keyword.hg
+  $ hg pull -u "$TESTDIR"/bundles/test-keyword.hg
   pulling from *test-keyword.hg (glob)
   requesting all changes
   adding changesets
diff --git a/tests/test-manifest.t b/tests/test-manifest.t
--- a/tests/test-manifest.t
+++ b/tests/test-manifest.t
@@ -10,7 +10,7 @@ Source bundle was generated with the fol
 # hg ci -Amb -d'1 0'
 
   $ hg init
-  $ hg -q pull "$TESTDIR/test-manifest.hg"
+  $ hg -q pull "$TESTDIR/bundles/test-manifest.hg"
 
 The next call is expected to return nothing:
 
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
@@ -30,7 +30,7 @@ a file, once as a link. Bundle was gener
 
   $ hg init t
   $ cd t
-  $ hg -q pull "$TESTDIR/test-merge-symlinks.hg"
+  $ hg -q pull "$TESTDIR/bundles/test-merge-symlinks.hg"
   $ hg up -C 3
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
diff --git a/tests/test-no-symlinks.t b/tests/test-no-symlinks.t
--- a/tests/test-no-symlinks.t
+++ b/tests/test-no-symlinks.t
@@ -16,7 +16,7 @@ Extract a symlink on a platform not supp
 
   $ hg init t
   $ cd t
-  $ hg pull -q "$TESTDIR/test-no-symlinks.hg"
+  $ hg pull -q "$TESTDIR/bundles/test-no-symlinks.hg"
   $ hg update
   4 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cat a.lnk && echo
diff --git a/tests/test-symlink-os-yes-fs-no.py b/tests/test-symlink-os-yes-fs-no.py
--- a/tests/test-symlink-os-yes-fs-no.py
+++ b/tests/test-symlink-os-yes-fs-no.py
@@ -2,6 +2,7 @@ import os, sys, time
 from mercurial import hg, ui, commands
 
 TESTDIR = os.environ["TESTDIR"]
+BUNDLEPATH = os.path.join(TESTDIR, 'bundles', 'test-no-symlinks.hg')
 
 # only makes sense to test on os which supports symlinks
 if not hasattr(os, "symlink"):
@@ -9,7 +10,7 @@ if not hasattr(os, "symlink"):
 
 # clone with symlink support
 u = ui.ui()
-hg.clone(u, os.path.join(TESTDIR, 'test-no-symlinks.hg'), 'test0')
+hg.clone(u, BUNDLEPATH, 'test0')
 
 repo = hg.repository(u, 'test0')
 
@@ -38,4 +39,4 @@ commands.status(u, repo)
 
 # try cloning a repo which contains symlinks
 u = ui.ui()
-hg.clone(u, os.path.join(TESTDIR, 'test-no-symlinks.hg'), 'test1')
+hg.clone(u, BUNDLEPATH, 'test1')