diff options
| author | Jakub Jirutka <jakub@jirutka.cz> | 2017-10-31 19:47:10 +0100 |
|---|---|---|
| committer | Jakub Jirutka <jakub@jirutka.cz> | 2017-10-31 19:48:07 +0100 |
| commit | 333d37da5968e0950bee6e22144a11bccd30e8dc (patch) | |
| tree | 46bd001ab69793eb2f92681c4214630fb7ebba15 /community/cargo/tests-fix-build-auth-http_auth_offered.patch | |
| parent | 5359cf5e9a5a2e8ba4faf548b3709c1fd0ff5563 (diff) | |
| download | aports-333d37da5968e0950bee6e22144a11bccd30e8dc.tar.bz2 aports-333d37da5968e0950bee6e22144a11bccd30e8dc.tar.xz | |
community/cargo: upgrade to 0.22.0
Diffstat (limited to 'community/cargo/tests-fix-build-auth-http_auth_offered.patch')
| -rw-r--r-- | community/cargo/tests-fix-build-auth-http_auth_offered.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/community/cargo/tests-fix-build-auth-http_auth_offered.patch b/community/cargo/tests-fix-build-auth-http_auth_offered.patch new file mode 100644 index 0000000000..8543c2897e --- /dev/null +++ b/community/cargo/tests-fix-build-auth-http_auth_offered.patch @@ -0,0 +1,47 @@ +From: Jakub Jirutka <jakub@jirutka.cz> +Date: Thu, 13 Aug 2016 14:47:00 +0200 +Last-Updated: Sat, 28 Oct 2017 14:59:00 +0200 +Subject: [PATCH] Fix test build-auth:http_auth_offered + +The test fails because of hard-coded libgit2 version, that may not be +the same as actually used libgit2... + +--- a/tests/build-auth.rs ++++ b/tests/build-auth.rs +@@ -20,7 +20,7 @@ + let addr = server.local_addr().unwrap(); + + fn headers(rdr: &mut BufRead) -> HashSet<String> { +- let valid = ["GET", "Authorization", "Accept", "User-Agent"]; ++ let valid = ["GET", "Authorization", "Accept"]; + rdr.lines().map(|s| s.unwrap()) + .take_while(|s| s.len() > 2) + .map(|s| s.trim().to_string()) +@@ -33,11 +33,6 @@ + let t = thread::spawn(move|| { + let mut conn = BufStream::new(server.accept().unwrap().0); + let req = headers(&mut conn); +- let user_agent = if cfg!(windows) { +- "User-Agent: git/1.0 (libgit2 0.25.0)" +- } else { +- "User-Agent: git/2.0 (libgit2 0.25.0)" +- }; + conn.write_all(b"\ + HTTP/1.1 401 Unauthorized\r\n\ + WWW-Authenticate: Basic realm=\"wheee\"\r\n +@@ -46,7 +41,6 @@ + assert_eq!(req, vec![ + "GET /foo/bar/info/refs?service=git-upload-pack HTTP/1.1", + "Accept: */*", +- user_agent, + ].into_iter().map(|s| s.to_string()).collect()); + drop(conn); + +@@ -61,7 +55,6 @@ + "GET /foo/bar/info/refs?service=git-upload-pack HTTP/1.1", + "Authorization: Basic Zm9vOmJhcg==", + "Accept: */*", +- user_agent, + ].into_iter().map(|s| s.to_string()).collect()); + }); + |