Patchwork D3109: tests: use `hg unbundle` in test-setdiscovery.t

login
register
mail settings
Submitter phabricator
Date April 5, 2018, 4:38 a.m.
Message ID <differential-rev-PHID-DREV-s4fg7u7ohtypmbgtk472-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/30335/
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
  This is testing how discovery between 2 well-defined repos works,
  not that `hg pull` works with bundles. Switch to `hg unbundle` so it
  works in environments where bundlerepos aren't supported.

REPOSITORY
  rHG Mercurial

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

AFFECTED FILES
  tests/test-setdiscovery.t

CHANGE DETAILS




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

Patch

diff --git a/tests/test-setdiscovery.t b/tests/test-setdiscovery.t
--- a/tests/test-setdiscovery.t
+++ b/tests/test-setdiscovery.t
@@ -512,8 +512,12 @@ 
   $ hg -R r2 bundle -qa $TESTDIR/bundles/issue4438-r2.hg
 #else
 use existing bundles:
-  $ hg clone -q $TESTDIR/bundles/issue4438-r1.hg r1
-  $ hg clone -q $TESTDIR/bundles/issue4438-r2.hg r2
+  $ hg init r1
+  $ hg -R r1 -q unbundle $TESTDIR/bundles/issue4438-r1.hg
+  $ hg -R r1 -q up
+  $ hg init r2
+  $ hg -R r2 -q unbundle $TESTDIR/bundles/issue4438-r2.hg
+  $ hg -R r2 -q up
 #endif
 
 Set iteration order could cause wrong and unstable results - fixed in 73cfaa348650: