pool/umoci
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
umoci/i586-0001-fix-mis-usage-of-time.Unix.patch

210 lines
8.7 KiB
Diff
Raw Blame History

From 351b92da519b61cb24b5f7f71e5b9cf2c8c7bb02 Mon Sep 17 00:00:00 2001
From: Aleksa Sarai <asarai@suse.de>
Date: Mon, 24 Jul 2017 07:34:49 +1000
Subject: [PATCH] *: fix mis-usage of unix.Stat_t.[AM]tim with time.Unix
80f787e4853d ("*: replace syscall with unix") did not correctly replace
the usage of (*syscall.Stat_t).[AM]tim.Unix() in tests, which resulted
in 32-bit builds failing in OBS because we run those tests in a %check
section. We need to add CI testing to make sure that we don't miss stuff
like this in the future.
Fixes: 80f787e4853d ("*: replace syscall with unix")
Signed-off-by: Aleksa Sarai <asarai@suse.de>
---
pkg/system/utime_linux_test.go | 48 ++++++++++++++++++++--------------------
pkg/unpriv/unpriv_utimes_test.go | 48 ++++++++++++++++++++--------------------
2 files changed, 48 insertions(+), 48 deletions(-)
diff --git a/pkg/system/utime_linux_test.go b/pkg/system/utime_linux_test.go
index f4597020626a..719071df61b1 100644
--- a/pkg/system/utime_linux_test.go
+++ b/pkg/system/utime_linux_test.go
@@ -57,10 +57,10 @@ func TestLutimesFile(t *testing.T) {
t.Fatal(err)
}
- atimeOld := time.Unix(fiOld.Atim.Sec, fiOld.Atim.Nsec)
- mtimeOld := time.Unix(fiOld.Mtim.Sec, fiOld.Mtim.Nsec)
- atimeNew := time.Unix(fiNew.Atim.Sec, fiNew.Atim.Nsec)
- mtimeNew := time.Unix(fiNew.Mtim.Sec, fiNew.Mtim.Nsec)
+ atimeOld := time.Unix(fiOld.Atim.Unix())
+ mtimeOld := time.Unix(fiOld.Mtim.Unix())
+ atimeNew := time.Unix(fiNew.Atim.Unix())
+ mtimeNew := time.Unix(fiNew.Mtim.Unix())
if atimeOld.Equal(atimeNew) {
t.Errorf("atime was not changed at all!")
@@ -106,10 +106,10 @@ func TestLutimesDirectory(t *testing.T) {
t.Fatal(err)
}
- atimeOld := time.Unix(fiOld.Atim.Sec, fiOld.Atim.Nsec)
- mtimeOld := time.Unix(fiOld.Mtim.Sec, fiOld.Mtim.Nsec)
- atimeNew := time.Unix(fiNew.Atim.Sec, fiNew.Atim.Nsec)
- mtimeNew := time.Unix(fiNew.Mtim.Sec, fiNew.Mtim.Nsec)
+ atimeOld := time.Unix(fiOld.Atim.Unix())
+ mtimeOld := time.Unix(fiOld.Mtim.Unix())
+ atimeNew := time.Unix(fiNew.Atim.Unix())
+ mtimeNew := time.Unix(fiNew.Mtim.Unix())
if atimeOld.Equal(atimeNew) {
t.Errorf("atime was not changed at all!")
@@ -161,10 +161,10 @@ func TestLutimesSymlink(t *testing.T) {
t.Fatal(err)
}
- atimeOld := time.Unix(fiOld.Atim.Sec, fiOld.Atim.Nsec)
- mtimeOld := time.Unix(fiOld.Mtim.Sec, fiOld.Mtim.Nsec)
- atimeNew := time.Unix(fiNew.Atim.Sec, fiNew.Atim.Nsec)
- mtimeNew := time.Unix(fiNew.Mtim.Sec, fiNew.Mtim.Nsec)
+ atimeOld := time.Unix(fiOld.Atim.Unix())
+ mtimeOld := time.Unix(fiOld.Mtim.Unix())
+ atimeNew := time.Unix(fiNew.Atim.Unix())
+ mtimeNew := time.Unix(fiNew.Mtim.Unix())
if atimeOld.Equal(atimeNew) {
t.Errorf("atime was not changed at all!")
@@ -180,10 +180,10 @@ func TestLutimesSymlink(t *testing.T) {
}
// Make sure that the parent directory was unchanged.
- atimeParentOld := time.Unix(fiParentOld.Atim.Sec, fiParentOld.Atim.Nsec)
- mtimeParentOld := time.Unix(fiParentOld.Mtim.Sec, fiParentOld.Mtim.Nsec)
- atimeParentNew := time.Unix(fiParentNew.Atim.Sec, fiParentNew.Atim.Nsec)
- mtimeParentNew := time.Unix(fiParentNew.Mtim.Sec, fiParentNew.Mtim.Nsec)
+ atimeParentOld := time.Unix(fiParentOld.Atim.Unix())
+ mtimeParentOld := time.Unix(fiParentOld.Mtim.Unix())
+ atimeParentNew := time.Unix(fiParentNew.Atim.Unix())
+ mtimeParentNew := time.Unix(fiParentNew.Mtim.Unix())
if !atimeParentOld.Equal(atimeParentNew) {
t.Errorf("parent directory atime was changed! old='%s' new='%s'", atimeParentOld, atimeParentNew)
@@ -239,10 +239,10 @@ func TestLutimesRelative(t *testing.T) {
t.Fatal(err)
}
- atimeOld := time.Unix(fiOld.Atim.Sec, fiOld.Atim.Nsec)
- mtimeOld := time.Unix(fiOld.Mtim.Sec, fiOld.Mtim.Nsec)
- atimeNew := time.Unix(fiNew.Atim.Sec, fiNew.Atim.Nsec)
- mtimeNew := time.Unix(fiNew.Mtim.Sec, fiNew.Mtim.Nsec)
+ atimeOld := time.Unix(fiOld.Atim.Unix())
+ mtimeOld := time.Unix(fiOld.Mtim.Unix())
+ atimeNew := time.Unix(fiNew.Atim.Unix())
+ mtimeNew := time.Unix(fiNew.Mtim.Unix())
if atimeOld.Equal(atimeNew) {
t.Errorf("atime was not changed at all!")
@@ -258,10 +258,10 @@ func TestLutimesRelative(t *testing.T) {
}
// Make sure that the parent directory was unchanged.
- atimeParentOld := time.Unix(fiParentOld.Atim.Sec, fiParentOld.Atim.Nsec)
- mtimeParentOld := time.Unix(fiParentOld.Mtim.Sec, fiParentOld.Mtim.Nsec)
- atimeParentNew := time.Unix(fiParentNew.Atim.Sec, fiParentNew.Atim.Nsec)
- mtimeParentNew := time.Unix(fiParentNew.Mtim.Sec, fiParentNew.Mtim.Nsec)
+ atimeParentOld := time.Unix(fiParentOld.Atim.Unix())
+ mtimeParentOld := time.Unix(fiParentOld.Mtim.Unix())
+ atimeParentNew := time.Unix(fiParentNew.Atim.Unix())
+ mtimeParentNew := time.Unix(fiParentNew.Mtim.Unix())
if !atimeParentOld.Equal(atimeParentNew) {
t.Errorf("parent directory atime was changed! old='%s' new='%s'", atimeParentOld, atimeParentNew)
diff --git a/pkg/unpriv/unpriv_utimes_test.go b/pkg/unpriv/unpriv_utimes_test.go
index 423e808a1da3..ac037e25f50f 100644
--- a/pkg/unpriv/unpriv_utimes_test.go
+++ b/pkg/unpriv/unpriv_utimes_test.go
@@ -56,10 +56,10 @@ func TestLutimesFile(t *testing.T) {
t.Fatal(err)
}
- atimeOld := time.Unix(fiOld.Atim.Sec, fiOld.Atim.Nsec)
- mtimeOld := time.Unix(fiOld.Mtim.Sec, fiOld.Mtim.Nsec)
- atimeNew := time.Unix(fiNew.Atim.Sec, fiNew.Atim.Nsec)
- mtimeNew := time.Unix(fiNew.Mtim.Sec, fiNew.Mtim.Nsec)
+ atimeOld := time.Unix(fiOld.Atim.Unix())
+ mtimeOld := time.Unix(fiOld.Mtim.Unix())
+ atimeNew := time.Unix(fiNew.Atim.Unix())
+ mtimeNew := time.Unix(fiNew.Mtim.Unix())
if atimeOld.Equal(atimeNew) {
t.Errorf("atime was not changed at all!")
@@ -104,10 +104,10 @@ func TestLutimesDirectory(t *testing.T) {
t.Fatal(err)
}
- atimeOld := time.Unix(fiOld.Atim.Sec, fiOld.Atim.Nsec)
- mtimeOld := time.Unix(fiOld.Mtim.Sec, fiOld.Mtim.Nsec)
- atimeNew := time.Unix(fiNew.Atim.Sec, fiNew.Atim.Nsec)
- mtimeNew := time.Unix(fiNew.Mtim.Sec, fiNew.Mtim.Nsec)
+ atimeOld := time.Unix(fiOld.Atim.Unix())
+ mtimeOld := time.Unix(fiOld.Mtim.Unix())
+ atimeNew := time.Unix(fiNew.Atim.Unix())
+ mtimeNew := time.Unix(fiNew.Mtim.Unix())
if atimeOld.Equal(atimeNew) {
t.Errorf("atime was not changed at all!")
@@ -158,10 +158,10 @@ func TestLutimesSymlink(t *testing.T) {
t.Fatal(err)
}
- atimeOld := time.Unix(fiOld.Atim.Sec, fiOld.Atim.Nsec)
- mtimeOld := time.Unix(fiOld.Mtim.Sec, fiOld.Mtim.Nsec)
- atimeNew := time.Unix(fiNew.Atim.Sec, fiNew.Atim.Nsec)
- mtimeNew := time.Unix(fiNew.Mtim.Sec, fiNew.Mtim.Nsec)
+ atimeOld := time.Unix(fiOld.Atim.Unix())
+ mtimeOld := time.Unix(fiOld.Mtim.Unix())
+ atimeNew := time.Unix(fiNew.Atim.Unix())
+ mtimeNew := time.Unix(fiNew.Mtim.Unix())
if atimeOld.Equal(atimeNew) {
t.Errorf("atime was not changed at all!")
@@ -177,10 +177,10 @@ func TestLutimesSymlink(t *testing.T) {
}
// Make sure that the parent directory was unchanged.
- atimeParentOld := time.Unix(fiParentOld.Atim.Sec, fiParentOld.Atim.Nsec)
- mtimeParentOld := time.Unix(fiParentOld.Mtim.Sec, fiParentOld.Mtim.Nsec)
- atimeParentNew := time.Unix(fiParentNew.Atim.Sec, fiParentNew.Atim.Nsec)
- mtimeParentNew := time.Unix(fiParentNew.Mtim.Sec, fiParentNew.Mtim.Nsec)
+ atimeParentOld := time.Unix(fiParentOld.Atim.Unix())
+ mtimeParentOld := time.Unix(fiParentOld.Mtim.Unix())
+ atimeParentNew := time.Unix(fiParentNew.Atim.Unix())
+ mtimeParentNew := time.Unix(fiParentNew.Mtim.Unix())
if !atimeParentOld.Equal(atimeParentNew) {
t.Errorf("parent directory atime was changed! old='%s' new='%s'", atimeParentOld, atimeParentNew)
@@ -236,10 +236,10 @@ func TestLutimesRelative(t *testing.T) {
t.Fatal(err)
}
- atimeOld := time.Unix(fiOld.Atim.Sec, fiOld.Atim.Nsec)
- mtimeOld := time.Unix(fiOld.Mtim.Sec, fiOld.Mtim.Nsec)
- atimeNew := time.Unix(fiNew.Atim.Sec, fiNew.Atim.Nsec)
- mtimeNew := time.Unix(fiNew.Mtim.Sec, fiNew.Mtim.Nsec)
+ atimeOld := time.Unix(fiOld.Atim.Unix())
+ mtimeOld := time.Unix(fiOld.Mtim.Unix())
+ atimeNew := time.Unix(fiNew.Atim.Unix())
+ mtimeNew := time.Unix(fiNew.Mtim.Unix())
if atimeOld.Equal(atimeNew) {
t.Errorf("atime was not changed at all!")
@@ -255,10 +255,10 @@ func TestLutimesRelative(t *testing.T) {
}
// Make sure that the parent directory was unchanged.
- atimeParentOld := time.Unix(fiParentOld.Atim.Sec, fiParentOld.Atim.Nsec)
- mtimeParentOld := time.Unix(fiParentOld.Mtim.Sec, fiParentOld.Mtim.Nsec)
- atimeParentNew := time.Unix(fiParentNew.Atim.Sec, fiParentNew.Atim.Nsec)
- mtimeParentNew := time.Unix(fiParentNew.Mtim.Sec, fiParentNew.Mtim.Nsec)
+ atimeParentOld := time.Unix(fiParentOld.Atim.Unix())
+ mtimeParentOld := time.Unix(fiParentOld.Mtim.Unix())
+ atimeParentNew := time.Unix(fiParentNew.Atim.Unix())
+ mtimeParentNew := time.Unix(fiParentNew.Mtim.Unix())
if !atimeParentOld.Equal(atimeParentNew) {
t.Errorf("parent directory atime was changed! old='%s' new='%s'", atimeParentOld, atimeParentNew)
--
2.13.3
Reference in New Issue View Git Blame Copy Permalink