On Thu, Dec 08, 2022 at 09:17:53PM +0200, Adrian Bunk wrote:
> Package: release.debian.org
> Severity: normal
> Tags: bullseye
> User: release.debian@packages.debian.org
> Usertags: pu
> X-Debbugs-Cc: Debian Go Packaging Team
>
>
> * Add upstream fix for intermittent test failures. (Closes: #848055)
>
> Test-only change to fix flaky build:
> https://tests.reproducible-builds.org/debian/history/golang-github-go-chef-chef.html
The missing debdiff is now attached.
cu
Adrian
diff -Nru
golang-github-go-chef-chef-0.0.1+git20161023.60.deb8c38/debian/changelog
golang-github-go-chef-chef-0.0.1+git20161023.60.deb8c38/debian/changelog
--- golang-github-go-chef-chef-0.0.1+git20161023.60.deb8c38/debian/changelog
2021-01-09 17:26:27.0 +0200
+++ golang-github-go-chef-chef-0.0.1+git20161023.60.deb8c38/debian/changelog
2022-12-08 20:41:54.0 +0200
@@ -1,3 +1,17 @@
+golang-github-go-chef-chef (0.0.1+git20161023.60.deb8c38-1.2~deb11u1)
bullseye; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild for bullseye.
+
+ -- Adrian Bunk Thu, 08 Dec 2022 20:41:54 +0200
+
+golang-github-go-chef-chef (0.0.1+git20161023.60.deb8c38-1.2) unstable;
urgency=medium
+
+ * Non-maintainer upload.
+ * Add upstream fix for intermittent test failures. (Closes: #848055)
+
+ -- Adrian Bunk Sun, 04 Dec 2022 19:02:27 +0200
+
golang-github-go-chef-chef (0.0.1+git20161023.60.deb8c38-1.1) unstable;
urgency=medium
* Non maintainer upload by the Reproducible Builds team.
diff -Nru
golang-github-go-chef-chef-0.0.1+git20161023.60.deb8c38/debian/patches/0001-Fix-the-intermittent-failures-in-the-String-tests.patch
golang-github-go-chef-chef-0.0.1+git20161023.60.deb8c38/debian/patches/0001-Fix-the-intermittent-failures-in-the-String-tests.patch
---
golang-github-go-chef-chef-0.0.1+git20161023.60.deb8c38/debian/patches/0001-Fix-the-intermittent-failures-in-the-String-tests.patch
1970-01-01 02:00:00.0 +0200
+++
golang-github-go-chef-chef-0.0.1+git20161023.60.deb8c38/debian/patches/0001-Fix-the-intermittent-failures-in-the-String-tests.patch
2022-12-04 19:02:27.0 +0200
@@ -0,0 +1,107 @@
+From b8a5b9cbb7b472eba5c1e2759aa6c288b8251de1 Mon Sep 17 00:00:00 2001
+From: markgibbons
+Date: Sat, 7 Dec 2019 07:10:13 -0800
+Subject: Fix the intermittent failures in the String tests
+
+diff --git a/client_test.go b/client_test.go
+index ad7aff7..7daeeaf 100644
+--- a/client_test.go
b/client_test.go
+@@ -40,15 +40,17 @@ func TestClientsService_List(t *testing.T) {
+ mux.HandleFunc("/clients", func(w http.ResponseWriter, r *http.Request)
{
+ fmt.Fprintf(w, `{"client1": "http://localhost/clients/client1";,
"client2": "http://localhost/clients/client2"}`)
+ })
+-
+ response, err := client.Clients.List()
+ if err != nil {
+ t.Errorf("Clients.List returned error: %v", err)
+ }
+
++ // The order printed by the String function is not defined
+ want := "client1 => http://localhost/clients/client1\nclient2 =>
http://localhost/clients/client2\n";
+- if response.String() != want {
+- t.Errorf("Clients.List returned:\n%+v\nwant:\n%+v\n",
response.String(), want)
++ want2 := "client2 => http://localhost/clients/client2\nclient1 =>
http://localhost/clients/client1\n";
++ rstr := response.String()
++ if rstr != want && rstr != want2 {
++ t.Errorf("Clients.List returned:\n%+v\nwant:\n%+v\n", rstr,
want)
+ }
+ }
+
+diff --git a/databag_test.go b/databag_test.go
+index 5ea7514..071fc4b 100644
+--- a/databag_test.go
b/databag_test.go
+@@ -157,8 +157,11 @@ func TestDataBagsService_UpdateItem(t *testing.T) {
+
+ func TestDataBagsService_DataBagListResultString(t *testing.T) {
+ e := &DataBagListResult{"bag1": "http://localhost/data/bag1";, "bag2":
"http://localhost/data/bag2"}
++ // The output order is not guarenteed by the String function, check for
either order
+ want := "bag1 => http://localhost/data/bag1\nbag2 =>
http://localhost/data/bag2\n";
+- if e.String() != want {
+- t.Errorf("DataBagListResult.String
returned:\n%+v\nwant:\n%+v\n", e.String(), want)
++ want2 := "bag2 => http://localhost/data/bag2\nbag1 =>
http://localhost/data/bag1\n";
++ ebag := e.String()
++ if ebag != want && ebag != want2 {
++ t.Errorf("DataBagListResult.String
returned:\n%+v\nwant:\n%+v\n", ebag, want)
+ }
+ }
+diff --git a/environment_test.go b/environment_test.go
+index 1bb7470..ff1b37a 100644
+--- a/environment_test.go
b/environment_test.go
+@@ -143,16 +143,19 @@ func TestEnvironmentsService_Put(t *testing.T) {
+
+ func TestEnvironmentsService_EnvironmentListResultString(t *testing.T) {
+ e := &EnvironmentResult{"_default":
"https://api.opscode.com/organizations/org_name/environments/_default";,
"webserver":
"https://api.opscode.com/organizations/org_name/environments/webserver"}
++ estr := e.String()
