test-gvfs-prococol, t5799: tests for gvfs-helper

Create t/helper/test-gvfs-protocol.c and t/t5799-gvfs-helper.sh
to test gvfs-helper.

Create t/helper/test-gvfs-protocol.c as a stand-alone web server that
speaks the GVFS Protocol [1] and serves loose objects and packfiles
to clients.  It is borrows heavily from the code in daemon.c.
It includes a "mayhem" mode to cause various network and HTTP errors
to test the retry/recovery ability of gvfs-helper.

Create t/t5799-gvfs-helper.sh to test gvfs-helper.

[1] https://github.com/microsoft/VFSForGit/blob/master/Protocol.md

Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: jeffhostetler

Makefile

@@ -1812,6 +1812,7 @@ endif
 	BASIC_CFLAGS += $(CURL_CFLAGS)
 
 	PROGRAM_OBJS += gvfs-helper.o
+	TEST_PROGRAMS_NEED_X += test-gvfs-protocol
 
 	REMOTE_CURL_PRIMARY = git-remote-http$X
 	REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X

bin-wrappers/.gitignore

@@ -6,4 +6,5 @@
 /git-upload-pack
 /scalar
 /test-fake-ssh
+/test-gvfs-protocol
 /test-tool

contrib/buildsystems/CMakeLists.txt

@@ -1116,6 +1116,20 @@ set(wrapper_scripts
 set(wrapper_test_scripts
 	test-fake-ssh test-tool)
 
+if(CURL_FOUND)
+	list(APPEND wrapper_test_scripts test-gvfs-protocol)
+
+	add_executable(test-gvfs-protocol ${CMAKE_SOURCE_DIR}/t/helper/test-gvfs-protocol.c)
+	target_link_libraries(test-gvfs-protocol common-main)
+
+	if(MSVC)
+		set_target_properties(test-gvfs-protocol
+					PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/t/helper)
+		set_target_properties(test-gvfs-protocol
+					PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/t/helper)
+	endif()
+endif()
+
 
 foreach(script ${wrapper_scripts})
 	file(STRINGS ${CMAKE_SOURCE_DIR}/bin-wrappers/wrap-for-bin.sh content NEWLINE_CONSUME)

gvfs-helper.c

@@ -186,6 +186,7 @@
 #include "abspath.h"
 #include "progress.h"
 #include "trace2.h"
+#include "versioncmp.h"
 
 static const char * const main_usage[] = {
 	N_("git gvfs-helper [<main_options>] config      [<options>]"),
@@ -210,6 +211,11 @@ static const char *const server_usage[] = {
 	NULL
 };
 
+static const char *const curl_version_usage[] = {
+	N_("git gvfs-helper [<main_options>] curl-version [<operator> <version>]"),
+	NULL
+};
+
 /*
  * "commitDepth" field in gvfs protocol
  */
@@ -1887,6 +1893,8 @@ static void install_loose(struct gh__request_params *params,
 	/*
 	 * We expect a loose object when we do a GET -or- when we
 	 * do a POST with only 1 object.
+	 *
+	 * Note that this content type is singular, not plural.
 	 */
 	if (strcmp(status->content_type.buf,
 		   "application/x-git-loose-object")) {
@@ -2121,14 +2129,17 @@ static void do_throttle_spin(struct gh__request_params *params,
 	strbuf_addstr(&region, gh__server_type_label[params->server_type]);
 	trace2_region_enter("gvfs-helper", region.buf, NULL);
 
-	progress = start_progress(the_repository, progress_msg, duration);
+	if (gh__cmd_opts.show_progress)
+		progress = start_progress(the_repository, progress_msg, duration);
+
 	while (now < end) {
 		display_progress(progress, (now - begin));
 
 		sleep_millisec(100);
 
 		now = time(NULL);
 	}
+
 	display_progress(progress, duration);
 	stop_progress(&progress);
 
@@ -2701,13 +2712,15 @@ static void do__http_post__gvfs_objects(struct gh__response_status *status,
 	params.headers = curl_slist_append(params.headers,
 					   "Content-Type: application/json");
 	/*
-	 * We really always want a packfile.  But if the payload only
-	 * requests 1 OID, the server will send us a single loose
-	 * objects instead.  (Apparently the server ignores us when we
-	 * only send application/x-git-packfile and does it anyway.)
+	 * If our POST contains more than one object, we want the
+	 * server to send us a packfile.  We DO NOT want the non-standard
+	 * concatenated loose object format, so we DO NOT send:
+	 *     "Accept: application/x-git-loose-objects" (plural)
 	 *
-	 * So to make it clear to my future self, go ahead and add
-	 * an accept header for loose objects and own it.
+	 * However, if the payload only requests 1 OID, the server
+	 * will send us a single loose object instead of a packfile,
+	 * so we ACK that and send:
+	 *     "Accept: application/x-git-loose-object" (singular)
 	 */
 	params.headers = curl_slist_append(params.headers,
 					   "Accept: application/x-git-packfile");
@@ -3311,6 +3324,37 @@ static enum gh__error_code do_sub_cmd__server(int argc, const char **argv)
 	return ec;
 }
 
+static enum gh__error_code do_sub_cmd__curl_version(int argc, const char **argv)
+{
+	static struct option curl_version_options[] = {
+		OPT_END(),
+	};
+	const char *current_version = curl_version_info(CURLVERSION_NOW)->version;
+
+	trace2_cmd_mode("curl-version");
+
+	if (argc > 1 && !strcmp(argv[1], "-h"))
+		usage_with_options(curl_version_usage, curl_version_options);
+
+	argc = parse_options(argc, argv, NULL,
+			     curl_version_options, curl_version_usage, 0);
+
+	if (argc == 0)
+		printf("%s\n", current_version);
+	else if (argc != 2)
+		die("expected [<operator> <version>], but got %d parameters", argc);
+	else {
+		int cmp = versioncmp(current_version, argv[1]);
+
+		return (strchr(argv[0], '=') && !cmp) ||
+			(strchr(argv[0], '>') && cmp > 0) ||
+			(strchr(argv[0], '<') && cmp < 0) ?
+			GH__ERROR_CODE__OK : GH__ERROR_CODE__ERROR;
+	}
+
+	return GH__ERROR_CODE__OK;
+}
+
 static enum gh__error_code do_sub_cmd(int argc, const char **argv)
 {
 	if (!strcmp(argv[0], "get"))
@@ -3325,6 +3369,9 @@ static enum gh__error_code do_sub_cmd(int argc, const char **argv)
 	if (!strcmp(argv[0], "server"))
 		return do_sub_cmd__server(argc, argv);
 
+	if (!strcmp(argv[0], "curl-version"))
+		return do_sub_cmd__curl_version(argc, argv);
+
 	// TODO have "test" mode that could be used to drive
 	// TODO unit testing.
 

t/helper/meson.build

@@ -88,6 +88,13 @@ test_tool = executable('test-tool',
 bin_wrappers += test_tool
 test_dependencies += test_tool
 
+test_gvfs_protocol = executable('test-gvfs-protocol',
+  sources: 'test-gvfs-protocol.c',
+  dependencies: [libgit_commonmain],
+)
+bin_wrappers += test_gvfs_protocol
+test_dependencies += test_gvfs_protocol
+
 test_fake_ssh = executable('test-fake-ssh',
   sources: 'test-fake-ssh.c',
   dependencies: [libgit_commonmain],