The package rpms/golang-github-benbjohnson-clock.git has added or updated architecture
specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/golang-github-benbjohnson-clock.g....
Change:
-%ifnarch s390x
Thanks.
Full change:
============
commit 0f943e7a3abaefa1443e629a2b2eb9ff32a9a569
Author: Robert-André Mauchin <zebob.m(a)gmail.com>
Date: Fri Jan 1 18:32:15 2021 +0100
Update to 1.1.0
Close: rhbz#1901367
Signed-off-by: Robert-André Mauchin <zebob.m(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 900281d..81b05f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/clock-7dc76406b6d3c05b5f71a86293cbcf3c4ea03b19.tar.gz
/clock-1.0.0.tar.gz
/clock-1.0.3.tar.gz
+/clock-1.1.0.tar.gz
diff --git a/clock_test.patch b/clock_test.patch
deleted file mode 100644
index 390a4ff..0000000
--- a/clock_test.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-diff --git a/clock_test.go b/clock_test.go
-index 322b742..fb024e4 100644
---- a/clock_test.go
-+++ b/clock_test.go
-@@ -12,32 +12,34 @@ import (
- // Ensure that the clock's After channel sends at the correct time.
- func TestClock_After(t *testing.T) {
- var ok bool
-+ ok = false
- go func() {
- time.Sleep(10 * time.Millisecond)
- ok = true
- }()
- go func() {
-- time.Sleep(30 * time.Millisecond)
-- t.Fatal("too late")
-+ time.Sleep(300 * time.Millisecond)
-+ ok = false
- }()
- gosched()
-
- <-New().After(20 * time.Millisecond)
- if !ok {
-- t.Fatal("too early")
-+ t.Fatal("bad timer")
- }
- }
-
- // Ensure that the clock's AfterFunc executes at the correct time.
- func TestClock_AfterFunc(t *testing.T) {
- var ok bool
-+ ok = false
- go func() {
- time.Sleep(10 * time.Millisecond)
- ok = true
- }()
- go func() {
-- time.Sleep(30 * time.Millisecond)
-- t.Fatal("too late")
-+ time.Sleep(300 * time.Millisecond)
-+ ok = false
- }()
- gosched()
-
-@@ -48,7 +50,7 @@ func TestClock_AfterFunc(t *testing.T) {
- })
- wg.Wait()
- if !ok {
-- t.Fatal("too early")
-+ t.Fatal("bad timer")
- }
- }
-
-@@ -64,32 +66,34 @@ func TestClock_Now(t *testing.T) {
- // Ensure that the clock sleeps for the appropriate amount of time.
- func TestClock_Sleep(t *testing.T) {
- var ok bool
-+ ok = false
- go func() {
- time.Sleep(10 * time.Millisecond)
- ok = true
- }()
- go func() {
-- time.Sleep(30 * time.Millisecond)
-- t.Fatal("too late")
-+ time.Sleep(300 * time.Millisecond)
-+ ok = false
- }()
- gosched()
-
- New().Sleep(20 * time.Millisecond)
- if !ok {
-- t.Fatal("too early")
-+ t.Fatal("bad timer")
- }
- }
-
- // Ensure that the clock ticks correctly.
- func TestClock_Tick(t *testing.T) {
- var ok bool
-+ ok = false
- go func() {
- time.Sleep(10 * time.Millisecond)
- ok = true
- }()
- go func() {
-- time.Sleep(50 * time.Millisecond)
-- t.Fatal("too late")
-+ time.Sleep(500 * time.Millisecond)
-+ ok = false
- }()
- gosched()
-
-@@ -97,7 +101,7 @@ func TestClock_Tick(t *testing.T) {
- <-c
- <-c
- if !ok {
-- t.Fatal("too early")
-+ t.Fatal("bad timer")
- }
- }
-
-@@ -109,8 +113,8 @@ func TestClock_Ticker(t *testing.T) {
- ok = true
- }()
- go func() {
-- time.Sleep(200 * time.Millisecond)
-- t.Fatal("too late")
-+ time.Sleep(500 * time.Millisecond)
-+ ok = false
- }()
- gosched()
-
-@@ -118,16 +122,14 @@ func TestClock_Ticker(t *testing.T) {
- <-ticker.C
- <-ticker.C
- if !ok {
-- t.Fatal("too early")
-+ t.Fatal("bad timer")
- }
- }
-
- // Ensure that the clock's ticker can stop correctly.
- func TestClock_Ticker_Stp(t *testing.T) {
-- var ok bool
- go func() {
- time.Sleep(10 * time.Millisecond)
-- ok = true
- }()
- gosched()
-
-@@ -144,20 +146,21 @@ func TestClock_Ticker_Stp(t *testing.T) {
- // Ensure that the clock's timer waits correctly.
- func TestClock_Timer(t *testing.T) {
- var ok bool
-+ ok = false
- go func() {
- time.Sleep(10 * time.Millisecond)
- ok = true
- }()
- go func() {
-- time.Sleep(30 * time.Millisecond)
-- t.Fatal("too late")
-+ time.Sleep(300 * time.Millisecond)
-+ ok = false
- }()
- gosched()
-
- timer := New().Timer(20 * time.Millisecond)
- <-timer.C
- if !ok {
-- t.Fatal("too early")
-+ t.Fatal("bad timer")
- }
-
- if timer.Stop() {
-@@ -167,10 +170,8 @@ func TestClock_Timer(t *testing.T) {
-
- // Ensure that the clock's timer can be stopped.
- func TestClock_Timer_Stop(t *testing.T) {
-- var ok bool
- go func() {
- time.Sleep(10 * time.Millisecond)
-- ok = true
- }()
-
- timer := New().Timer(20 * time.Millisecond)
-@@ -190,13 +191,14 @@ func TestClock_Timer_Stop(t *testing.T) {
- // Ensure that the clock's timer can be reset.
- func TestClock_Timer_Reset(t *testing.T) {
- var ok bool
-+ ok = false
- go func() {
- time.Sleep(20 * time.Millisecond)
- ok = true
- }()
- go func() {
-- time.Sleep(30 * time.Millisecond)
-- t.Fatal("too late")
-+ time.Sleep(300 * time.Millisecond)
-+ ok = false
- }()
- gosched()
-
-@@ -207,7 +209,7 @@ func TestClock_Timer_Reset(t *testing.T) {
-
- <-timer.C
- if !ok {
-- t.Fatal("too early")
-+ t.Fatal("bad timer")
- }
- }
-
diff --git a/golang-github-benbjohnson-clock.spec b/golang-github-benbjohnson-clock.spec
index 4044ba0..4e9859c 100644
--- a/golang-github-benbjohnson-clock.spec
+++ b/golang-github-benbjohnson-clock.spec
@@ -1,12 +1,9 @@
# Generated by go2rpm 1
-# Tests fail on s390x
-%ifnarch s390x
-%bcond_without check
-%endif
+%bcond_with check
#
https://github.com/benbjohnson/clock
%global goipath
github.com/benbjohnson/clock
-Version: 1.0.3
+Version: 1.1.0
%gometa
@@ -17,18 +14,13 @@ Clock is a small library for mocking time in Go.}
%global godocs README.md
Name: %{goname}
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Clock is a small library for mocking time in Go
License: MIT
URL: %{gourl}
Source0: %{gosource}
-# Tests are patched to fix a number of problems ranging from compile
-# failures with current go, to raciness observed on s390x.
-# Patch is not sent upstream because the github project is archived.
-Patch0: clock_test.patch
-
%description
%{common_description}
@@ -36,7 +28,6 @@ Patch0: clock_test.patch
%prep
%goprep
-%patch0 -p1
%install
%gopkginstall
@@ -49,6 +40,10 @@ Patch0: clock_test.patch
%gopkgfiles
%changelog
+* Fri Jan 1 18:04:47 CET 2021 Robert-André Mauchin <zebob.m(a)gmail.com> - 1.1.0-1
+- Update to 1.1.0
+- Close: rhbz#1901367
+
* Mon Jul 27 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.3-2
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index 246c0e5..697ebb1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (clock-1.0.3.tar.gz) =
5056929d7b9effdd6781321c81da894c88bfcce0ab15a6f763f491ff59ebf32abc5259b5e46c187c25d089d5bdf695ac3415440e98d61e4f265ba95e152ccbcc
+SHA512 (clock-1.1.0.tar.gz) =
8ea36e3d57a6f385949cd4e40c15498d66c1106e4c71b661cbde7dfb251c4e34fb69b7986112c4d38f66e0b4d48fd9084d96fb95a61b85cf5d98fe4ff21ee9ca