Patchwork [evolve-ext] evolve: fix test breaks related to double->single quote changes

login
register
mail settings
Submitter Kostia Balytskyi
Date Sept. 22, 2016, 4:17 p.m.
Message ID <bc4c9029017b8dbc35d4.1474561020@dev1902.lla1.facebook.com>
Download mbox | patch
Permalink /patch/16759/
State Accepted
Headers show

Comments

Kostia Balytskyi - Sept. 22, 2016, 4:17 p.m.
# HG changeset patch
# User Kostia Balytskyi <ikostia@fb.com>
# Date 1474560930 25200
#      Thu Sep 22 09:15:30 2016 -0700
# Branch stable
# Node ID bc4c9029017b8dbc35d4bb47b9be23f2c85ca121
# Parent  ac125f907dfe8f85d0c2771b3f71eaec788d9ea0
evolve: fix test breaks related to double->single quote changes
Pierre-Yves David - Sept. 22, 2016, 11:25 p.m.
On 09/22/2016 11:22 PM, Kevin Bullock wrote:
>> On Sep 22, 2016, at 11:17, Kostia Balytskyi <ikostia@fb.com> wrote:
>>
>> # HG changeset patch
>> # User Kostia Balytskyi <ikostia@fb.com>
>> # Date 1474560930 25200
>> #      Thu Sep 22 09:15:30 2016 -0700
>> # Branch stable
>> # Node ID bc4c9029017b8dbc35d4bb47b9be23f2c85ca121
>> # Parent  ac125f907dfe8f85d0c2771b3f71eaec788d9ea0
>> evolve: fix test breaks related to double->single quote changes
>
> It might be better to fix these by grepping for the output you're actually looking for, e.g.:
>
>   $ cd A.3.b
>   $ hg push -R main -r e5ea8f9c7314 pushdest | grep ^abort:
>   abort: push creates new remote head e5ea8f9c7314!

Meh, having full output is usually useful in catching various bugs. In 
addition some of these tests case should eventually get migrated in the 
core repository where this would matters less.

Cheers,
Pierre-Yves David - Sept. 24, 2016, 1:16 a.m.
On 09/22/2016 06:17 PM, Kostia Balytskyi wrote:
> # HG changeset patch
> # User Kostia Balytskyi <ikostia@fb.com>
> # Date 1474560930 25200
> #      Thu Sep 22 09:15:30 2016 -0700
> # Branch stable
> # Node ID bc4c9029017b8dbc35d4bb47b9be23f2c85ca121
> # Parent  ac125f907dfe8f85d0c2771b3f71eaec788d9ea0
> evolve: fix test breaks related to double->single quote changes

Pushed, thanks.

Patch

diff --git a/tests/test-evolve.t b/tests/test-evolve.t
--- a/tests/test-evolve.t
+++ b/tests/test-evolve.t
@@ -1126,7 +1126,7 @@  Enabling commands selectively, no comman
    summary       summarize working directory state
    update        update working directory (or switch revisions)
   
-  (use "hg help" for the full list of commands or "hg -v" for details)
+  (use 'hg help' for the full list of commands or 'hg -v' for details)
   [255]
   $ hg fold
   hg: unknown command 'fold'
@@ -1152,7 +1152,7 @@  Enabling commands selectively, no comman
    summary       summarize working directory state
    update        update working directory (or switch revisions)
   
-  (use "hg help" for the full list of commands or "hg -v" for details)
+  (use 'hg help' for the full list of commands or 'hg -v' for details)
   [255]
 Enabling commands selectively, only fold enabled, next is still unknown
   $ cat >> $HGRCPATH <<EOF
@@ -1188,7 +1188,7 @@  Enabling commands selectively, only fold
    summary       summarize working directory state
    update        update working directory (or switch revisions)
   
-  (use "hg help" for the full list of commands or "hg -v" for details)
+  (use 'hg help' for the full list of commands or 'hg -v' for details)
   [255]
 
 Restore all of the evolution features
diff --git a/tests/test-exchange-A3.t b/tests/test-exchange-A3.t
--- a/tests/test-exchange-A3.t
+++ b/tests/test-exchange-A3.t
@@ -168,7 +168,7 @@  check it complains about multiple heads
   pushing to pushdest
   searching for changes
   abort: push creates new remote head e5ea8f9c7314!
-  (merge or see "hg help push" for details about pushing new heads)
+  (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ cd ..
 
diff --git a/tests/test-sharing.t b/tests/test-sharing.t
--- a/tests/test-sharing.t
+++ b/tests/test-sharing.t
@@ -342,7 +342,7 @@  her change, so now she can publish it.
   searching for changes
   remote has heads on branch 'default' that are not known locally: 540ba8f317e6
   abort: push creates new remote head cbdfbd5a5db2 with bookmark 'bug15'!
-  (pull and merge or see "hg help push" for details about pushing new heads)
+  (pull and merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ hg pull ../public
   pulling from ../public
diff --git a/tests/test-stabilize-result.t b/tests/test-stabilize-result.t
--- a/tests/test-stabilize-result.t
+++ b/tests/test-stabilize-result.t
@@ -98,7 +98,7 @@  Test evolve with conflict
   +newer a
   $ hg evolve --continue
   grafting 5:3655f0f50885 "newer a"
-  abort: unresolved merge conflicts (see "hg help resolve")
+  abort: unresolved merge conflicts (see 'hg help resolve')
   [255]
   $ hg resolve -m a
   (no more unresolved files)