Patchwork [1,of,5] test-resolve: clarify test descriptions and consistently use "should"

login
register
mail settings
Submitter Martin von Zweigbergk
Date Oct. 10, 2014, 4:14 p.m.
Message ID <0c8c43d9366c1b9a7a87.1412957661@handduk2.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/6182/
State Accepted
Headers show

Comments

Martin von Zweigbergk - Oct. 10, 2014, 4:14 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@gmail.com>
# Date 1412828371 25200
#      Wed Oct 08 21:19:31 2014 -0700
# Node ID 0c8c43d9366c1b9a7a87b8df56f689c978ec8a88
# Parent  a1eb21f5caea4366310e32aa85248791d5bbfa0c
test-resolve: clarify test descriptions and consistently use "should"

Patch

diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -31,7 +31,8 @@ 
   $ hg resolve -l
   U file
 
-resolving an unknown path emits a warning
+resolving an unknown path should emit a warning
+
   $ hg resolve -m does-not-exist
   arguments do not match paths that need resolving
 
@@ -42,11 +43,12 @@ 
   (no more unresolved files)
   $ hg commit -m 'resolved'
 
-resolve -l should be empty
+resolve -l should be empty after commit
 
   $ hg resolve -l
 
-resolve -m should abort since no merge in progress
+resolve -m should abort when no merge in progress
+
   $ hg resolve -m
   abort: resolve command not applicable when not merging
   [255]
@@ -56,7 +58,7 @@ 
   $ mkdir .hg/merge
   $ touch .hg/merge/state
 
-resolve -l, should be empty
+resolve -l should be empty
 
   $ hg resolve -l