1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
|
From: Reinhard Tartler <siretart@tauware.de>
Date: Wed, 10 Jul 2024 20:21:38 -0400
Subject: Skip tests that require root
===================================================================
---
buildah_test.go | 3 +++
cmd/buildah/common_test.go | 2 +-
convertcw_test.go | 3 +++
copier/copier_test.go | 2 +-
internal/open/open_linux_test.go | 4 ++++
internal/open/open_test.go | 4 ++++
6 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/buildah_test.go b/buildah_test.go
index d9cad2d..d019aba 100644
--- a/buildah_test.go
+++ b/buildah_test.go
@@ -46,6 +46,9 @@ func TestOpenBuilderCommonBuildOpts(t *testing.T) {
GraphRoot: t.TempDir(),
GraphDriverName: "vfs",
})
+ if err != nil {
+ t.Skipf("Not enough permissions to execute test: %s", err)
+ }
require.NoError(t, err)
t.Cleanup(func() { _, err := store.Shutdown(true); assert.NoError(t, err) })
b, err := NewBuilder(ctx, store, BuilderOptions{})
diff --git a/cmd/buildah/common_test.go b/cmd/buildah/common_test.go
index c55e206..3fc7a5f 100644
--- a/cmd/buildah/common_test.go
+++ b/cmd/buildah/common_test.go
@@ -107,7 +107,7 @@ func failTestIfNotRoot(t *testing.T) {
if err != nil {
t.Log("Could not determine user. Running without root may cause tests to fail")
} else if u.Uid != "0" {
- t.Fatal("tests will fail unless run as root")
+ t.Skip("Skip tests that will fail unless run as root")
}
}
diff --git a/convertcw_test.go b/convertcw_test.go
index 32f1fb6..a6fb860 100644
--- a/convertcw_test.go
+++ b/convertcw_test.go
@@ -78,6 +78,9 @@ func TestCWConvertImage(t *testing.T) {
GraphDriverName: "vfs",
}
store, err := storage.GetStore(storeOptions)
+ if err != nil {
+ t.Skipf("Not enough permissions to run test: %s")
+ }
require.NoError(t, err)
t.Cleanup(func() {
if _, err := store.Shutdown(true); err != nil {
diff --git a/copier/copier_test.go b/copier/copier_test.go
index 24d0a15..86733e4 100644
--- a/copier/copier_test.go
+++ b/copier/copier_test.go
@@ -202,7 +202,7 @@ var (
}{
{
name: "regular",
- rootOnly: false,
+ rootOnly: true, // some of these tests seem to require real root
headers: []tar.Header{
{Name: "file-0", Typeflag: tar.TypeReg, Size: 123456789, Mode: 0o600, ModTime: testDate},
{Name: "file-a", Typeflag: tar.TypeReg, Size: 23, Mode: 0o600, ModTime: testDate},
diff --git a/internal/open/open_linux_test.go b/internal/open/open_linux_test.go
index e89f5fa..d17fc08 100644
--- a/internal/open/open_linux_test.go
+++ b/internal/open/open_linux_test.go
@@ -4,6 +4,7 @@ import (
"os"
"path/filepath"
"testing"
+ "strings"
"github.com/stretchr/testify/require"
"golang.org/x/sys/unix"
@@ -18,6 +19,9 @@ func TestBindFdToPath(t *testing.T) {
require.NoError(t, err, "opening descriptor for first directory")
second := t.TempDir()
err = BindFdToPath(uintptr(fd), second)
+ if strings.Contains(err.Error(), "operation not permitted") {
+ t.Skipf("Skipping test: %v", err)
+ }
require.NoError(t, err)
t.Cleanup(func() {
err := unix.Unmount(second, unix.MNT_DETACH)
diff --git a/internal/open/open_test.go b/internal/open/open_test.go
index c349a10..8c1155a 100644
--- a/internal/open/open_test.go
+++ b/internal/open/open_test.go
@@ -4,6 +4,7 @@ import (
"io"
"os"
"path/filepath"
+ "strings"
"testing"
"github.com/containers/storage/pkg/reexec"
@@ -52,6 +53,9 @@ func TestOpenInChroot(t *testing.T) {
},
},
})
+ if strings.Contains(result.Err, "operation not permitted") {
+ t.Skipf("Skipping test: %v", result.Err)
+ }
require.Empty(t, result.Err, "result from second client")
require.Equal(t, 1, len(result.Open), "results from second client")
require.Empty(t, result.Open[0].Err, "first (only) result from second client")
|
