Hello community,
here is the log from the commit of package golang-org-x-crypto for
openSUSE:Factory checked in at 2015-09-08 17:42:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/golang-org-x-crypto (Old)
and /work/SRC/openSUSE:Factory/.golang-org-x-crypto.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "golang-org-x-crypto"
Changes:
--------
--- /work/SRC/openSUSE:Factory/golang-org-x-crypto/golang-org-x-crypto.changes
2015-07-24 09:58:42.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.golang-org-x-crypto.new/golang-org-x-crypto.changes
2015-09-08 17:46:48.000000000 +0200
@@ -1,0 +2,5 @@
+Fri Sep 4 11:14:02 UTC 2015 - dval...@suse.com
+
+- Fix flaky TestHostKeyCert test (crypto-fix-ssh.patch) (boo#944474)
+
+-------------------------------------------------------------------
New:
----
crypto-fix-ssh.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ golang-org-x-crypto.spec ++++++
--- /var/tmp/diff_new_pack.tbUv9p/_old 2015-09-08 17:46:51.000000000 +0200
+++ /var/tmp/diff_new_pack.tbUv9p/_new 2015-09-08 17:46:51.000000000 +0200
@@ -24,6 +24,7 @@
Group: Development/Languages/Other
Url: https://github.com/golang/crypto
Source: crypto-%{version}.tar.xz
+Patch0: crypto-fix-ssh.patch
BuildRequires: golang-packaging
BuildRequires: xz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -40,6 +41,7 @@
%prep
%setup -q -n crypto-%{version}
+%patch0 -p1
%build
%goprep golang.org/x/crypto
++++++ crypto-fix-ssh.patch ++++++
>From 77de70a8d459abbd88b95faa92f4a69bd2f5a7d8 Mon Sep 17 00:00:00 2001
From: Dave Cheney <d...@cheney.net>
Date: Fri, 31 Jul 2015 14:55:01 +1000
Subject: [PATCH] ssh: fix flake in TestHostKeyCert
Update golang/go#11811
The increased default concurrency in Go 1.5 showed up a test flake in
the TestHostKeyCert test. Under load, when the client provided incorrect
data, both sides would race to tear down the connection, which would often
lead to the server side, running in its own goroutine to see an unexpected
EOF or connection reset.
Fix this flake (and the incorrect use of t.Fatalf) by passing the error back
to the main goroutine for inspection. This also lets us ignore the expected
error in the unsuccessful path
Change-Id: I5a95c6d240479e9d537f34177e5ca8023b1b08e9
Reviewed-on: https://go-review.googlesource.com/12916
Reviewed-by: Brad Fitzpatrick <bradf...@golang.org>
---
ssh/certs_test.go | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/ssh/certs_test.go b/ssh/certs_test.go
index d6c4a33..c5f2e53 100644
--- a/ssh/certs_test.go
+++ b/ssh/certs_test.go
@@ -186,15 +186,15 @@ func TestHostKeyCert(t *testing.T) {
defer c1.Close()
defer c2.Close()
+ errc := make(chan error)
+
go func() {
conf := ServerConfig{
NoClientAuth: true,
}
conf.AddHostKey(certSigner)
_, _, _, err := NewServerConn(c1, &conf)
- if err != nil {
- t.Fatalf("NewServerConn: %v", err)
- }
+ errc <- err
}()
config := &ClientConfig{
@@ -207,5 +207,10 @@ func TestHostKeyCert(t *testing.T) {
if (err == nil) != succeed {
t.Fatalf("NewClientConn(%q): %v", name, err)
}
+
+ err = <-errc
+ if (err == nil) != succeed {
+ t.Fatalf("NewServerConn(%q): %v", name, err)
+ }
}
}
