Patchwork D3111: tests: use unbundle in test-symlink-os-yes-fs-no.py

login
register
mail settings
Submitter phabricator
Date April 5, 2018, 4:38 a.m.
Message ID <differential-rev-PHID-DREV-zn5han7ed7n7hrfclvxm-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/30337/
State Superseded
Headers show

Comments

phabricator - April 5, 2018, 4:38 a.m.
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  The test (which should probably be rewritten as a .t test - the
  test was initially authored in 2009 and this may have predated
  some test harness features allowing us to implement it as a .t
  test) is verifying symlink behavior with regards to working
  directory operations. How it pulls bundle data into a repo is
  not relevant. So we can switch from pull to unbundle so we can
  support environments where bundlerepos don't work.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D3111

AFFECTED FILES
  tests/test-symlink-os-yes-fs-no.py
  tests/test-symlink-os-yes-fs-no.py.out

CHANGE DETAILS




To: indygreg, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/tests/test-symlink-os-yes-fs-no.py.out b/tests/test-symlink-os-yes-fs-no.py.out
--- a/tests/test-symlink-os-yes-fs-no.py.out
+++ b/tests/test-symlink-os-yes-fs-no.py.out
@@ -1,16 +1,12 @@ 
-requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 4 changes to 4 files
 new changesets d326ae2d01ee
-updating to branch default
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
-requesting all changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 4 changes to 4 files
 new changesets d326ae2d01ee
-updating to branch default
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
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
@@ -21,10 +21,11 @@ 
 # hide outer repo
 hg.peer(u, {}, '.', create=True)
 
-# clone with symlink support
-hg.clone(u, {}, BUNDLEPATH, 'test0')
+# unbundle with symlink support
+hg.peer(u, {}, 'test0', create=True)
 
 repo = hg.repository(u, 'test0')
+commands.unbundle(u, repo, BUNDLEPATH, update=True)
 
 # wait a bit, or the status call wont update the dirstate
 time.sleep(1)
@@ -52,6 +53,8 @@ 
 repo = hg.repository(u, 'test0')
 commands.status(u, repo)
 
-# try cloning a repo which contains symlinks
+# try unbundling a repo which contains symlinks
 u = uimod.ui.load()
-hg.clone(u, {}, BUNDLEPATH, 'test1')
+
+repo = hg.repository(u, 'test1', create=True)
+commands.unbundle(u, repo, BUNDLEPATH, update=True)