From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 11 Dec 2017 12:10:54 +0000 (-0800)
Subject: Relax a few error messages from libgit2
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~4^2~28^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=873f69c0b8ba2156bda49fd936a3e2757103f189;p=cargo.git

Relax a few error messages from libgit2

They were tweaked a bit recently so let's enusre they're not too strict.
---

diff --git a/tests/bad-config.rs b/tests/bad-config.rs
index 1d8c2fe21..87717578c 100644
--- a/tests/bad-config.rs
+++ b/tests/bad-config.rs
@@ -389,7 +389,7 @@ Caused by:
   failed to clone into: [..]
 
 Caused by:
-  [[..]] 'file:///' is not a valid local file URI
+  [..]'file:///' is not a valid local file URI[..]
 "));
 }
 
diff --git a/tests/build-auth.rs b/tests/build-auth.rs
index 064fce4fd..5420de7bc 100644
--- a/tests/build-auth.rs
+++ b/tests/build-auth.rs
@@ -166,14 +166,14 @@ Caused by:
   {errmsg}
 ",
         errmsg = if cfg!(windows) {
-            "[[..]] failed to send request: [..]\n"
+            "[..]failed to send request: [..]"
         } else if cfg!(target_os = "macos") {
             // OSX is difficult to tests as some builds may use
             // Security.framework and others may use OpenSSL. In that case let's
             // just not verify the error message here.
             "[..]"
         } else {
-            "[..] SSL error: [..]"
+            "[..]SSL error: [..]"
         })));
 
     t.join().ok().unwrap();
@@ -207,7 +207,7 @@ fn ssh_something_happens() {
 ", addr = addr))
                     .with_stderr_contains("\
 Caused by:
-  [[..]] failed to start SSH session: Failed getting banner
+  [..]failed to start SSH session: Failed getting banner[..]
 "));
     t.join().ok().unwrap();
 }