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
|
From: Mathias Gibbens <gibmat@debian.org>
Description: Disable/skip tests that attempt user xattr operations, which fail on the buildds
Forwarded: not-needed
diff --git a/oci/layer/generate_linux_test.go b/oci/layer/generate_linux_test.go
index 9538518..b7ded23 100644
--- a/oci/layer/generate_linux_test.go
+++ b/oci/layer/generate_linux_test.go
@@ -151,9 +151,9 @@ func TestTranslateOverlayWhiteouts_XattrOpaque(t *testing.T) {
testTranslateOverlayWhiteouts_XattrOpaque(t, OverlayfsRootfs{})
})
- t.Run("user.overlay", func(t *testing.T) {
+ /*t.Run("user.overlay", func(t *testing.T) {
testTranslateOverlayWhiteouts_XattrOpaque(t, OverlayfsRootfs{UserXattr: true})
- })
+ })*/
}
func testTranslateOverlayWhiteouts_XattrWhiteout(t *testing.T, onDiskFmt OverlayfsRootfs) { //nolint:revive // var-naming is less important than matching the func TestXyz name
@@ -213,7 +213,7 @@ func TestTranslateOverlayWhiteouts_XattrWhiteout(t *testing.T) {
testTranslateOverlayWhiteouts_XattrWhiteout(t, OverlayfsRootfs{})
})
- t.Run("user.overlay", func(t *testing.T) {
+ /*t.Run("user.overlay", func(t *testing.T) {
testTranslateOverlayWhiteouts_XattrWhiteout(t, OverlayfsRootfs{UserXattr: true})
- })
+ })*/
}
diff --git a/oci/layer/tar_extract_linux_test.go b/oci/layer/tar_extract_linux_test.go
index 31948c3..6942fac 100644
--- a/oci/layer/tar_extract_linux_test.go
+++ b/oci/layer/tar_extract_linux_test.go
@@ -122,7 +122,7 @@ func TestUnpackEntry_OverlayfsRootfs_Whiteout(t *testing.T) {
func TestUnpackEntry_OverlayfsRootfs_OpaqueWhiteout(t *testing.T) {
testNeedsMknod(t)
- for _, userxattr := range []bool{true, false} {
+ for _, userxattr := range []bool{false} {
userxattr := userxattr // copy iterator
t.Run(fmt.Sprintf("UserXattr=%v", userxattr), func(t *testing.T) {
dir := t.TempDir()
@@ -163,7 +163,7 @@ func TestUnpackEntry_OverlayfsRootfs_OpaqueWhiteout(t *testing.T) {
func TestUnpackEntry_OverlayfsRootfs_Whiteout_MissingDirs(t *testing.T) {
testNeedsMknod(t)
- for _, userxattr := range []bool{true, false} {
+ for _, userxattr := range []bool{false} {
userxattr := userxattr // copy iterator
t.Run(fmt.Sprintf("UserXattr=%v", userxattr), func(t *testing.T) {
dir := t.TempDir()
@@ -213,7 +213,7 @@ func TestUnpackEntry_OverlayfsRootfs_Whiteout_MissingDirs(t *testing.T) {
func TestUnpackEntry_OverlayfsRootfs_Whiteout_Nested(t *testing.T) {
testNeedsMknod(t)
- for _, userxattr := range []bool{true, false} {
+ for _, userxattr := range []bool{false} {
userxattr := userxattr // copy iterator
t.Run(fmt.Sprintf("UserXattr=%v", userxattr), func(t *testing.T) {
dir := t.TempDir()
@@ -270,7 +270,7 @@ func TestUnpackEntry_OverlayfsRootfs_Whiteout_Nested(t *testing.T) {
func TestUnpackEntry_OverlayfsRootfs_OpaqueWhiteoutConvert(t *testing.T) {
testNeedsMknod(t)
- for _, userxattr := range []bool{true, false} {
+ for _, userxattr := range []bool{false} {
userxattr := userxattr // copy iterator
t.Run(fmt.Sprintf("UserXattr=%v", userxattr), func(t *testing.T) {
dir := t.TempDir()
diff --git a/oci/layer/xattr_linux_test.go b/oci/layer/xattr_linux_test.go
index bfdacd1..e10390e 100644
--- a/oci/layer/xattr_linux_test.go
+++ b/oci/layer/xattr_linux_test.go
@@ -230,6 +230,8 @@ func testUnpackGenerateRoundTrip_ComplexXattr_OverlayfsRootfs(t *testing.T, tarX
}
func TestUnpackGenerateRoundTrip_ComplexXattr_OverlayfsRootfs(t *testing.T) {
+ t.Skip("skipping test")
+
t.Run("TarEntries=trusted.overlay.", func(t *testing.T) {
testUnpackGenerateRoundTrip_ComplexXattr_OverlayfsRootfs(t, "trusted.")
})
@@ -240,6 +242,7 @@ func TestUnpackGenerateRoundTrip_ComplexXattr_OverlayfsRootfs(t *testing.T) {
}
func TestUnpackGenerateRoundTrip_MockedSELinux(t *testing.T) {
+ t.Skip("skipping test")
// For test purposes we add a fake forbidden attribute that an unprivileged
// user can easily write to (and thus we can test it). This is meant to be
// a stand-in for "security.selinux" or any other xattr that gets
|
