Patchwork tests: un-nest the `order` repo in test-rebase-scenario-global

login
register
mail settings
Submitter Augie Fackler
Date Feb. 27, 2017, 11:15 p.m.
Message ID <9458a27320261aa23db9.1488237328@imladris.local>
Download mbox | patch
Permalink /patch/18818/
State Accepted
Headers show

Comments

Augie Fackler - Feb. 27, 2017, 11:15 p.m.
# HG changeset patch
# User Augie Fackler <augie@google.com>
# Date 1484861228 18000
#      Thu Jan 19 16:27:08 2017 -0500
# Node ID 9458a27320261aa23db959f8f84193fa4a316aee
# Parent  3f8f53190d6afed0aca6c6527236edad28ce785c
tests: un-nest the `order` repo in test-rebase-scenario-global

This wasn't hurting anything, but it's more in line with how we manage
other tests.
Yuya Nishihara - March 3, 2017, 1:18 p.m.
On Mon, 27 Feb 2017 18:15:28 -0500, Augie Fackler wrote:
> # HG changeset patch
> # User Augie Fackler <augie@google.com>
> # Date 1484861228 18000
> #      Thu Jan 19 16:27:08 2017 -0500
> # Node ID 9458a27320261aa23db959f8f84193fa4a316aee
> # Parent  3f8f53190d6afed0aca6c6527236edad28ce785c
> tests: un-nest the `order` repo in test-rebase-scenario-global
> 
> This wasn't hurting anything, but it's more in line with how we manage
> other tests.

Sure, queued, thanks.

Patch

diff --git a/tests/test-rebase-scenario-global.t b/tests/test-rebase-scenario-global.t
--- a/tests/test-rebase-scenario-global.t
+++ b/tests/test-rebase-scenario-global.t
@@ -773,7 +773,7 @@  Test that rebase is not confused by $CWD
 Get back to the root of cwd-vanish. Note that even though `cd ..`
 works on most systems, it does not work on FreeBSD 10, so we use an
 absolute path to get back to the repository.
-  $ cd $TESTTMP/cwd-vanish
+  $ cd $TESTTMP
 
 Test that rebase is done in topo order (issue5370)
 
@@ -819,7 +819,7 @@  Test that rebase is done in topo order (
   rebasing 4:82ae8dc7a9b7 "E"
   rebasing 3:ab709c9f7171 "D"
   rebasing 5:412b391de760 "F"
-  saved backup bundle to $TESTTMP/cwd-vanish/order/.hg/strip-backup/76035bbd54bd-e341bc99-backup.hg (glob)
+  saved backup bundle to $TESTTMP/order/.hg/strip-backup/76035bbd54bd-e341bc99-backup.hg (glob)
 
   $ hg tglog
   o  6: 'F'
@@ -840,7 +840,7 @@  Test that rebase is done in topo order (
 Test experimental revset
 ========================
 
-  $ cd ..
+  $ cd ../cwd-vanish
 
 Make the repo a bit more interesting