Patchwork [5,of,5,remotenames-ext] tests: adjust for changed outputs of strip

login
register
mail settings
Submitter Ryan McElroy
Date July 18, 2017, 12:54 p.m.
Message ID <e7cce2b6198ace7769e2.1500382482@devbig314.prn1.facebook.com>
Download mbox | patch
Permalink /patch/22487/
State Accepted
Headers show

Comments

Ryan McElroy - July 18, 2017, 12:54 p.m.
# HG changeset patch
# User Ryan McElroy <rmcelroy@fb.com>
# Date 1500382130 25200
#      Tue Jul 18 05:48:50 2017 -0700
# Node ID e7cce2b6198ace7769e2c68a5b67eddde794cfeb
# Parent  be5e71c20437ba8200593eca46380436b926fcb8
tests: adjust for changed outputs of strip

Patch

diff --git a/tests/test-pull-rebase.t b/tests/test-pull-rebase.t
--- a/tests/test-pull-rebase.t
+++ b/tests/test-pull-rebase.t
@@ -88,7 +88,7 @@  Tests 'hg pull --rebase' defaults to ori
   nothing to rebase
   $ hg rebase -d 3
   rebasing 1:6a7c7fb59c1e "localcommit" (bmnottracking)
-  saved backup bundle to $TESTTMP/localrepo/.hg/strip-backup/6a7c7fb59c1e-55f908e9-backup.hg (glob)
+  saved backup bundle to $TESTTMP/localrepo/.hg/strip-backup/6a7c7fb59c1e-55f908e9-*.hg (glob)
   $ printdag
   @  localcommit | bmnottracking |
   |
@@ -189,7 +189,7 @@  Test pull with --rebase and --tool
   (run 'hg heads .' to see heads, 'hg merge' to merge)
   rebasing 6:1d01e32a0efb "somelocalchanges" (tracking2)
   merging editedbyboth
-  saved backup bundle to $TESTTMP/localrepo/.hg/strip-backup/*-backup.hg (glob)
+  saved backup bundle to $TESTTMP/localrepo/.hg/strip-backup/*.hg (glob)
   $ printdag
   @  somelocalchanges | tracking2 |
   |
diff --git a/tests/test-pushto.t b/tests/test-pushto.t
--- a/tests/test-pushto.t
+++ b/tests/test-pushto.t
@@ -47,7 +47,7 @@  Test that config changes what is pushed 
   [255]
   $ hg --config extensions.strip= strip d36c0562f908 d2ae7f538514
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-  saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/d36c0562f908-ccf5bddc-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/d36c0562f908-ccf5bddc-*.hg (glob)
 
 Test that config allows anonymous heads to be pushed
 
@@ -187,7 +187,7 @@  Test that local must have rev of remote 
   $ hg up -r 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg --config extensions.strip= strip -B headb
-  saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/1846eede8b68-61b88d4a-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/1846eede8b68-61b88d4a-*.hg (glob)
   bookmark 'headb' deleted
   $ hg push --to @ -r headc
   pushing rev cc61aa6be3dc to destination $TESTTMP/repo1 bookmark @
@@ -207,7 +207,7 @@  Clean up repo1
   o  0 a
   
   $ hg --config extensions.strip= strip 2
-  saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/cc61aa6be3dc-73e4f2eb-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/cc61aa6be3dc-73e4f2eb-*.hg (glob)
   $ cd ../repo2
 
 Test that rebasing and pushing works as expected
@@ -240,7 +240,7 @@  Test that rebasing and pushing works as 
   (no more unresolved files)
   $ hg --config extensions.rebase= rebase --continue
   rebasing 1:cc61aa6be3dc "c" (headc)
-  saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/cc61aa6be3dc-73e4f2eb-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/cc61aa6be3dc-73e4f2eb-*.hg (glob)
   $ hg log -G -T '{rev} {desc} {bookmarks} {remotebookmarks}\n'
   o  2 c headc
   |
diff --git a/tests/test-tracking.t b/tests/test-tracking.t
--- a/tests/test-tracking.t
+++ b/tests/test-tracking.t
@@ -55,7 +55,7 @@  Create a tracking bookmark
   (no more unresolved files)
   $ hg rebase --continue
   rebasing 2:dea4e1d2ca0e "b" (tip b)
-  saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/dea4e1d2ca0e-a7f1cee1-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo1/.hg/strip-backup/dea4e1d2ca0e-a7f1cee1-*.hg (glob)
   $ hg log -G -T '{rev} {desc} {bookmarks} {remotebookmarks}'
   @  2 b b
   |
@@ -230,7 +230,7 @@  Test implicit rebase destination
    * c                         5:ff58066d17c3            [remote/a: 1 ahead, 2 behind]
   $ hg rebase
   rebasing 5:ff58066d17c3 "d" (tip c)
-  saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/ff58066d17c3-470dd0be-backup.hg (glob)
+  saved backup bundle to $TESTTMP/repo2/.hg/strip-backup/ff58066d17c3-470dd0be-*.hg (glob)
   $ hg log -G -T '{rev} {node|short} {bookmarks} {remotebookmarks}\n'
   @  5 8d13dc14fef1 c
   |