From: Luke Diamand <luke@diamand.org>
To: git@vger.kernel.org
Cc: Pete Wyckoff <pw@padd.com>, Junio C Hamano <gitster@pobox.com>,
Blair Holloway <Blair_Holloway@playstation.sony.com>,
Luke Diamand <luke@diamand.org>
Subject: [PATCHv2 4/4] git-p4: update locked test case
Date: Fri, 3 Apr 2015 19:53:38 +0100 [thread overview]
Message-ID: <1428087218-8186-5-git-send-email-luke@diamand.org> (raw)
In-Reply-To: <1428087218-8186-1-git-send-email-luke@diamand.org>
The add-new-file and copy-existing-file tests from
t9816-git-p4-locked.sh now pass. Update the test
case accordingly.
Signed-off-by: Luke Diamand <luke@diamand.org>
---
t/t9816-git-p4-locked.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/t/t9816-git-p4-locked.sh b/t/t9816-git-p4-locked.sh
index 464f10b..d048bd3 100755
--- a/t/t9816-git-p4-locked.sh
+++ b/t/t9816-git-p4-locked.sh
@@ -35,7 +35,7 @@ test_expect_success 'edit with lock not taken' '
)
'
-test_expect_failure 'add with lock not taken' '
+test_expect_success 'add with lock not taken' '
test_when_finished cleanup_git &&
git p4 clone --dest="$git" //depot &&
(
@@ -107,7 +107,7 @@ test_expect_failure 'chmod with lock taken' '
)
'
-test_expect_failure 'copy with lock taken' '
+test_expect_success 'copy with lock taken' '
lock_in_another_client &&
test_when_finished cleanup_git &&
test_when_finished "cd \"$cli\" && p4 revert file2 && rm -f file2" &&
--
2.3.0.rc1.30.g76afe74
next prev parent reply other threads:[~2015-04-03 18:54 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-03 18:53 [PATCHv2 0/4] git-p4: fix filetype detection on files opened exclusively Luke Diamand
2015-04-03 18:53 ` [PATCHv2 1/4] git-p4: fix small bug in locked test scripts Luke Diamand
2015-04-03 19:02 ` Eric Sunshine
2015-04-03 18:53 ` [PATCHv2 2/4] git-p4: small fix for locked-file-move-test Luke Diamand
2015-04-03 18:53 ` [PATCHv2 3/4] git-p4: fix filetype detection on files opened exclusively Luke Diamand
2015-04-03 18:53 ` Luke Diamand [this message]
2015-04-03 20:00 ` [PATCHv2 4/4] git-p4: update locked test case Eric Sunshine
2015-04-03 21:55 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1428087218-8186-5-git-send-email-luke@diamand.org \
--to=luke@diamand.org \
--cc=Blair_Holloway@playstation.sony.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pw@padd.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).