Commit Diff

Commit:
a244cd923ce2b5d7e81afd34b5ab402b87a69abb
From:
Stefan Sperling <stsp@stsp.name>
Date:
Message:
fix fetch test's expected results and check results properly
Actions:
Patch | Tree
commit - 9a682fbe2c64ce71685dc332f7d2758ede442224
commit + a244cd923ce2b5d7e81afd34b5ab402b87a69abb
blob - ff64378ee31865853d76973f1ac1ecf6f4c31698
blob + 31b97a896df4896b127a7424821636148ccc8a8a
--- regress/fetch/fetch_test.c
+++ regress/fetch/fetch_test.c
@@ -83,35 +83,42 @@ fetch_parse_uri(void)
 		    NULL, NULL, NULL, NULL, NULL, GOT_ERR_PARSE_URI },
 
 		{ "git://127.0.0.1/git/myrepo",
-		    "git", "localhost", GOT_DEFAULT_GIT_PORT_STR, "git",
-		    "myrepo", GOT_ERR_OK },
+		    "git", "127.0.0.1", GOT_DEFAULT_GIT_PORT_STR,
+		    "/git/myrepo", "myrepo", GOT_ERR_OK },
 		{ "http://127.0.0.1/git/myrepo",
-		    "http", "localhost", GOT_DEFAULT_GIT_PORT_STR, "git",
-		    "myrepo", GOT_ERR_OK },
+		    "http", "127.0.0.1", GOT_DEFAULT_GIT_PORT_STR,
+		    "/git/myrepo", "myrepo", GOT_ERR_OK },
 		{ "gopher://127.0.0.1/git/myrepo",
-		    "gopher", "localhost", GOT_DEFAULT_GIT_PORT_STR, "git",
-		    "myrepo", GOT_ERR_OK },
+		    "gopher", "127.0.0.1", GOT_DEFAULT_GIT_PORT_STR,
+		    "/git/myrepo", "myrepo", GOT_ERR_OK },
 
 		{ "git://127.0.0.1:22/git/myrepo",
-		    "git", "localhost", "22", "git", "myrepo", GOT_ERR_OK },
-
+		    "git", "127.0.0.1", "22", "/git/myrepo", "myrepo",
+		    GOT_ERR_OK },
 		{ "git://127.0.0.1/git/repos/foo/bar/myrepo.git",
-		    "git", "localhost", GOT_DEFAULT_GIT_PORT_STR,
-		    "git/repos/foo/bar", "myrepo", GOT_ERR_OK },
+		    "git", "127.0.0.1", GOT_DEFAULT_GIT_PORT_STR,
+		    "/git/repos/foo/bar/myrepo.git", "myrepo", GOT_ERR_OK },
 		{ "https://127.0.0.1/git/repos/foo/../bar/myrepo.git",
-		    "https", "localhost", GOT_DEFAULT_GIT_PORT_STR,
-		    "git/repos/foo/../bar", "myrepo", GOT_ERR_OK },
+		    "https", "127.0.0.1", GOT_DEFAULT_GIT_PORT_STR,
+		    "/git/repos/foo/../bar/myrepo.git", "myrepo",
+		    GOT_ERR_OK },
 
 		{ "git+ssh://127.0.0.1:22/git/myrepo",
-		    "git+ssh", "localhost", "22", "git", "myrepo", GOT_ERR_OK },
+		    "git+ssh", "127.0.0.1", "22", "/git/myrepo", "myrepo",
+		    GOT_ERR_OK },
 		{ "ssh://127.0.0.1:22/git/myrepo",
-		    "ssh", "localhost", "22", "git", "myrepo", GOT_ERR_OK },
+		    "ssh", "127.0.0.1", "22", "/git/myrepo", "myrepo",
+		    GOT_ERR_OK },
+
 		{ "127.0.0.1:git/myrepo",
-		    "ssh", "localhost", "22", "git", "myrepo", GOT_ERR_OK },
-		{ "127.0.0.1:/git/myrepo",
-		    "ssh", "localhost", "22", "git", "myrepo", GOT_ERR_OK },
+		    "ssh", "127.0.0.1", "22", "git/myrepo", "myrepo",
+		    GOT_ERR_OK },
+		{ "127.0.0.1:/git/myrepo",
+		    "ssh", "127.0.0.1", "22", "/git/myrepo", "myrepo",
+		    GOT_ERR_OK },
 		{ "127.0.0.1:22/git/myrepo",
-		    "ssh", "localhost", "22", "git", "myrepo", GOT_ERR_OK },
+		    "ssh", "127.0.0.1", "22", "22/git/myrepo", "myrepo",
+		    GOT_ERR_OK },
 	};
 	int i;
 
@@ -187,6 +194,32 @@ fetch_parse_uri(void)
 			return 0;
 		}
 
+		if (expected_host != NULL && strcmp(expected_host, host)) {
+			test_printf("%d: host %s; expected %s\n", i, host,
+			    expected_host);
+			return 0;
+		}
+
+		if (expected_port != NULL && strcmp(expected_port, port)) {
+			test_printf("%d: port %s; expected %s\n", i, port,
+			    expected_port);
+			return 0;
+		}
+
+		if (expected_server_path != NULL &&
+		    strcmp(expected_server_path, server_path)) {
+			test_printf("%d: server_path %s; expected %s\n", i,
+			    server_path, expected_server_path);
+			return 0;
+		}
+
+		if (expected_repo_name != NULL &&
+		    strcmp(expected_repo_name, repo_name)) {
+			test_printf("%d: repo_name %s; expected %s\n", i,
+			    repo_name, expected_repo_name);
+			return 0;
+		}
+
 		free(proto);
 		proto = NULL;
 		free(host);