Patchwork [2,of,4,main-line-of-work] test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'

login
register
mail settings
Submitter Pierre-Yves David
Date May 16, 2015, 1:45 a.m.
Message ID <55241a70eec911a50eb7.1431740735@marginatus.alto.octopoid.net>
Download mbox | patch
Permalink /patch/9112/
State Accepted
Headers show

Comments

Pierre-Yves David - May 16, 2015, 1:45 a.m.
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1431252360 25200
#      Sun May 10 03:06:00 2015 -0700
# Node ID 55241a70eec911a50eb70cff82139885dcedad6d
# Parent  586e9b4b542a3bbaef92a6f93c4da89f91fc6933
test: test both bundle1 and bundle2 paths in 'test-push-hook-lock.t'

The locking scheme is a bit different in each cases. So we explicitly test each
case.

Patch

diff --git a/tests/test-push-hook-lock.t b/tests/test-push-hook-lock.t
--- a/tests/test-push-hook-lock.t
+++ b/tests/test-push-hook-lock.t
@@ -24,15 +24,27 @@ 
   $ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc
 
   $ echo bar >> 3/foo
   $ hg --cwd 3 ci -m bar
 
-  $ hg --cwd 3 push ../2
+  $ hg --cwd 3 push ../2 --config experimental.bundle2-exp=False
   pushing to ../2
   searching for changes
   adding changesets
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
   lock:  user *, process * (*s) (glob)
   wlock: free
 
+  $ hg --cwd 1 --config extensions.strip= strip tip -q
+  $ hg --cwd 2 --config extensions.strip= strip tip -q
+  $ hg --cwd 3 push ../2 --config experimental.bundle2-exp=True
+  pushing to ../2
+  searching for changes
+  adding changesets
+  adding manifests
+  adding file changes
+  added 1 changesets with 1 changes to 1 files
+  lock:  user *, process * (*s) (glob)
+  wlock: user *, process * (*s) (glob)
+