Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package golang-github-ncw-swift Fix RC bug https://bugs.debian.org/923804 golang-github-ncw-swift: FTBFS randomly (TestWatchdogReaderOnSlowNetwork fails) Please see debdiff in attachment. There's a new debian/gitlab-ci.yml file, it has no relation to this package, the pkg-go team has automated tool to commit this in git repo. unblock golang-github-ncw-swift/0.0~git20180327.b2a7479-2
diff -Nru golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/changelog golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/changelog --- golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/changelog 2018-04-10 03:29:11.000000000 +0800 +++ golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/changelog 2019-03-16 15:38:22.000000000 +0800 @@ -1,3 +1,11 @@ +golang-github-ncw-swift (0.0~git20180327.b2a7479-2) unstable; urgency=medium + + * Team upload. + * Add patch to fix unreliable test (Closes: #923804) + + Fix TestWatchdogReaderOnSlowNetwork + + -- Shengjing Zhu <zhsj@debian.org> Sat, 16 Mar 2019 15:38:22 +0800 + golang-github-ncw-swift (0.0~git20180327.b2a7479-1) unstable; urgency=medium [ Paul Tagliamonte ] diff -Nru golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/gitlab-ci.yml golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/gitlab-ci.yml --- golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/gitlab-ci.yml 1970-01-01 08:00:00.000000000 +0800 +++ golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/gitlab-ci.yml 2019-03-16 15:38:22.000000000 +0800 @@ -0,0 +1,28 @@ + +# auto-generated, DO NOT MODIFY. +# The authoritative copy of this file lives at: +# https://salsa.debian.org/go-team/ci/blob/master/cmd/ci/gitlabciyml.go + +# TODO: publish under debian-go-team/ci +image: stapelberg/ci2 + +test_the_archive: + artifacts: + paths: + - before-applying-commit.json + - after-applying-commit.json + script: + # Create an overlay to discard writes to /srv/gopath/src after the build: + - "rm -rf /cache/overlay/{upper,work}" + - "mkdir -p /cache/overlay/{upper,work}" + - "mount -t overlay overlay -o lowerdir=/srv/gopath/src,upperdir=/cache/overlay/upper,workdir=/cache/overlay/work /srv/gopath/src" + - "export GOPATH=/srv/gopath" + - "export GOCACHE=/cache/go" + # Build the world as-is: + - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > before-applying-commit.json" + # Copy this package into the overlay: + - "GBP_CONF_FILES=:debian/gbp.conf gbp buildpackage --git-no-pristine-tar --git-ignore-branch --git-ignore-new --git-export-dir=/tmp/export --git-no-overlay --git-tarball-dir=/nonexistant --git-cleaner=/bin/true --git-builder='dpkg-buildpackage -S -d --no-sign'" + - "pgt-gopath -dsc /tmp/export/*.dsc" + # Rebuild the world: + - "ci-build -exemptions=/var/lib/ci-build/exemptions.json > after-applying-commit.json" + - "ci-diff before-applying-commit.json after-applying-commit.json" diff -Nru golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/patches/0001-Fix-TestWatchdogReaderOnSlowNetwork.patch golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/patches/0001-Fix-TestWatchdogReaderOnSlowNetwork.patch --- golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/patches/0001-Fix-TestWatchdogReaderOnSlowNetwork.patch 1970-01-01 08:00:00.000000000 +0800 +++ golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/patches/0001-Fix-TestWatchdogReaderOnSlowNetwork.patch 2019-03-16 15:38:22.000000000 +0800 @@ -0,0 +1,24 @@ +From: Shengjing Zhu <zhsj@debian.org> +Date: Sat, 16 Mar 2019 15:34:46 +0800 +Subject: Fix TestWatchdogReaderOnSlowNetwork + +Author: Nick Craig-Wood +Bug: https://github.com/ncw/swift/issues/119 +Bug-Debian: https://bugs.debian.org/923804 +--- + watchdog_reader_test.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/watchdog_reader_test.go b/watchdog_reader_test.go +index 8e8f013..08dabff 100644 +--- a/watchdog_reader_test.go ++++ b/watchdog_reader_test.go +@@ -98,7 +98,7 @@ func TestWatchdogReaderOnSlowNetwork(t *testing.T) { + delayPerByte: 200 * time.Millisecond / time.Duration(len(byteString)), + } + +- timer, firedChan := setupTimer(10 * time.Millisecond) ++ timer, firedChan := setupTimer(100 * time.Millisecond) + wr := newWatchdogReader(reader, 190*time.Millisecond, timer) + + //use io.ReadFull instead of ioutil.ReadAll here because ReadAll already does diff -Nru golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/patches/series golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/patches/series --- golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/patches/series 1970-01-01 08:00:00.000000000 +0800 +++ golang-github-ncw-swift-0.0~git20180327.b2a7479/debian/patches/series 2019-03-16 15:38:22.000000000 +0800 @@ -0,0 +1 @@ +0001-Fix-TestWatchdogReaderOnSlowNetwork.patch
Attachment:
signature.asc
Description: PGP signature