The previous change modified GIT_TRACE2_EVENT_NESTING by default within test-lib.sh. These custom assignments throughout the test suite are no longer necessary. Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			88 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
			
		
		
	
	
			88 lines
		
	
	
		
			3.3 KiB
		
	
	
	
		
			Bash
		
	
	
		
			Executable File
		
	
	
	
	
#!/bin/sh
 | 
						|
 | 
						|
test_description='session ID in capabilities'
 | 
						|
 | 
						|
. ./test-lib.sh
 | 
						|
 | 
						|
REPO="$(pwd)/repo"
 | 
						|
LOCAL_PRISTINE="$(pwd)/local_pristine"
 | 
						|
 | 
						|
test_expect_success 'setup repos for session ID capability tests' '
 | 
						|
	git init "$REPO" &&
 | 
						|
	test_commit -C "$REPO" a &&
 | 
						|
	git clone "file://$REPO" "$LOCAL_PRISTINE" &&
 | 
						|
	test_commit -C "$REPO" b
 | 
						|
'
 | 
						|
 | 
						|
for PROTO in 0 1 2
 | 
						|
do
 | 
						|
	test_expect_success "session IDs not advertised by default (fetch v${PROTO})" '
 | 
						|
		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
 | 
						|
		cp -r "$LOCAL_PRISTINE" local &&
 | 
						|
		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
 | 
						|
		git -c protocol.version=$PROTO -C local fetch \
 | 
						|
			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
 | 
						|
			origin &&
 | 
						|
		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
 | 
						|
		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
 | 
						|
	'
 | 
						|
 | 
						|
	test_expect_success "session IDs not advertised by default (push v${PROTO})" '
 | 
						|
		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
 | 
						|
		test_when_finished "git -C local push --delete origin new-branch" &&
 | 
						|
		cp -r "$LOCAL_PRISTINE" local &&
 | 
						|
		git -C local pull --no-rebase origin &&
 | 
						|
		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
 | 
						|
		git -c protocol.version=$PROTO -C local push \
 | 
						|
			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
 | 
						|
			origin HEAD:new-branch &&
 | 
						|
		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
 | 
						|
		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
 | 
						|
	'
 | 
						|
done
 | 
						|
 | 
						|
test_expect_success 'enable SID advertisement' '
 | 
						|
	git -C "$REPO" config transfer.advertiseSID true &&
 | 
						|
	git -C "$LOCAL_PRISTINE" config transfer.advertiseSID true
 | 
						|
'
 | 
						|
 | 
						|
for PROTO in 0 1 2
 | 
						|
do
 | 
						|
	test_expect_success "session IDs advertised (fetch v${PROTO})" '
 | 
						|
		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
 | 
						|
		cp -r "$LOCAL_PRISTINE" local &&
 | 
						|
		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
 | 
						|
		git -c protocol.version=$PROTO -C local fetch \
 | 
						|
			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
 | 
						|
			origin &&
 | 
						|
		grep \"key\":\"server-sid\" tr2-client-events &&
 | 
						|
		grep \"key\":\"client-sid\" tr2-server-events
 | 
						|
	'
 | 
						|
 | 
						|
	test_expect_success "session IDs advertised (push v${PROTO})" '
 | 
						|
		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
 | 
						|
		test_when_finished "git -C local push --delete origin new-branch" &&
 | 
						|
		cp -r "$LOCAL_PRISTINE" local &&
 | 
						|
		git -C local pull --no-rebase origin &&
 | 
						|
		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
 | 
						|
		git -c protocol.version=$PROTO -C local push \
 | 
						|
			--receive-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-receive-pack" \
 | 
						|
			origin HEAD:new-branch &&
 | 
						|
		grep \"key\":\"server-sid\" tr2-client-events &&
 | 
						|
		grep \"key\":\"client-sid\" tr2-server-events
 | 
						|
	'
 | 
						|
 | 
						|
	test_expect_success "client & server log negotiated version (v${PROTO})" '
 | 
						|
		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
 | 
						|
		cp -r "$LOCAL_PRISTINE" local &&
 | 
						|
		GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
 | 
						|
		git -c protocol.version=$PROTO -C local fetch \
 | 
						|
			--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
 | 
						|
			origin &&
 | 
						|
		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-client-events &&
 | 
						|
		grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-server-events
 | 
						|
	'
 | 
						|
done
 | 
						|
 | 
						|
test_done
 |