git p4: test submit
Try each of the five diff patterns that might happen during submit. Signed-off-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
		 Pete Wyckoff
					Pete Wyckoff
				
			
				
					committed by
					
						 Junio C Hamano
						Junio C Hamano
					
				
			
			
				
	
			
			
			 Junio C Hamano
						Junio C Hamano
					
				
			
						parent
						
							8d7ec3629c
						
					
				
				
					commit
					0f224e5b73
				
			| @ -88,6 +88,98 @@ test_expect_success 'submit with master branch name from argv' ' | ||||
| 	) | ||||
| ' | ||||
|  | ||||
| # | ||||
| # Basic submit tests, the five handled cases | ||||
| # | ||||
|  | ||||
| test_expect_success 'submit modify' ' | ||||
| 	test_when_finished cleanup_git && | ||||
| 	git p4 clone --dest="$git" //depot && | ||||
| 	( | ||||
| 		cd "$git" && | ||||
| 		git config git-p4.skipSubmitEdit true && | ||||
| 		echo line >>file1 && | ||||
| 		git add file1 && | ||||
| 		git commit -m file1 && | ||||
| 		git p4 submit | ||||
| 	) && | ||||
| 	( | ||||
| 		cd "$cli" && | ||||
| 		test_path_is_file file1 && | ||||
| 		test_line_count = 2 file1 | ||||
| 	) | ||||
| ' | ||||
|  | ||||
| test_expect_success 'submit add' ' | ||||
| 	test_when_finished cleanup_git && | ||||
| 	git p4 clone --dest="$git" //depot && | ||||
| 	( | ||||
| 		cd "$git" && | ||||
| 		git config git-p4.skipSubmitEdit true && | ||||
| 		echo file13 >file13 && | ||||
| 		git add file13 && | ||||
| 		git commit -m file13 && | ||||
| 		git p4 submit | ||||
| 	) && | ||||
| 	( | ||||
| 		cd "$cli" && | ||||
| 		test_path_is_file file13 | ||||
| 	) | ||||
| ' | ||||
|  | ||||
| test_expect_success 'submit delete' ' | ||||
| 	test_when_finished cleanup_git && | ||||
| 	git p4 clone --dest="$git" //depot && | ||||
| 	( | ||||
| 		cd "$git" && | ||||
| 		git config git-p4.skipSubmitEdit true && | ||||
| 		git rm file4.t && | ||||
| 		git commit -m "delete file4.t" && | ||||
| 		git p4 submit | ||||
| 	) && | ||||
| 	( | ||||
| 		cd "$cli" && | ||||
| 		test_path_is_missing file4.t | ||||
| 	) | ||||
| ' | ||||
|  | ||||
| test_expect_success 'submit copy' ' | ||||
| 	test_when_finished cleanup_git && | ||||
| 	git p4 clone --dest="$git" //depot && | ||||
| 	( | ||||
| 		cd "$git" && | ||||
| 		git config git-p4.skipSubmitEdit true && | ||||
| 		git config git-p4.detectCopies true && | ||||
| 		git config git-p4.detectCopiesHarder true && | ||||
| 		cp file5.t file5.ta && | ||||
| 		git add file5.ta && | ||||
| 		git commit -m "copy to file5.ta" && | ||||
| 		git p4 submit | ||||
| 	) && | ||||
| 	( | ||||
| 		cd "$cli" && | ||||
| 		test_path_is_file file5.ta | ||||
| 	) | ||||
| ' | ||||
|  | ||||
| test_expect_success 'submit rename' ' | ||||
| 	test_when_finished cleanup_git && | ||||
| 	git p4 clone --dest="$git" //depot && | ||||
| 	( | ||||
| 		cd "$git" && | ||||
| 		git config git-p4.skipSubmitEdit true && | ||||
| 		git config git-p4.detectRenames true && | ||||
| 		git mv file6.t file6.ta && | ||||
| 		git commit -m "rename file6.t to file6.ta" && | ||||
| 		git p4 submit | ||||
| 	) && | ||||
| 	( | ||||
| 		cd "$cli" && | ||||
| 		test_path_is_missing file6.t && | ||||
| 		test_path_is_file file6.ta | ||||
| 	) | ||||
| ' | ||||
|  | ||||
| test_expect_success 'kill p4d' ' | ||||
| 	kill_p4d | ||||
| ' | ||||
|  | ||||
		Reference in New Issue
	
	Block a user