File tree Expand file tree Collapse file tree 3 files changed +13
-8
lines changed Expand file tree Collapse file tree 3 files changed +13
-8
lines changed Original file line number Diff line number Diff line change @@ -7845,14 +7845,16 @@ loop0:
7845
7845
cdAddress := sb .ContainerdAddress ()
7846
7846
if cdAddress == "" {
7847
7847
if checkContent {
7848
- store := proxy .NewContentStore (c .ContentClient ())
7849
- count := 0
7850
- err := store .Walk (sb .Context (), func (info content.Info ) error {
7851
- count ++
7852
- return nil
7853
- })
7854
- require .NoError (t , err )
7855
- require .Equal (t , 0 , count )
7848
+ if err := workers .HasFeatureCompat (t , sb , workers .FeatureContentCheck ); err == nil {
7849
+ store := proxy .NewContentStore (c .ContentClient ())
7850
+ count := 0
7851
+ err := store .Walk (sb .Context (), func (info content.Info ) error {
7852
+ count ++
7853
+ return nil
7854
+ })
7855
+ require .NoError (t , err )
7856
+ require .Equal (t , 0 , count )
7857
+ }
7856
7858
}
7857
7859
t .Logf ("checkAllReleasable: skipping check for exported tars in non-containerd test" )
7858
7860
return
Original file line number Diff line number Diff line change @@ -50,6 +50,7 @@ func InitDockerdWorker() {
50
50
Unsupported : []string {
51
51
FeatureSecurityMode ,
52
52
FeatureCNINetwork ,
53
+ FeatureContentCheck ,
53
54
},
54
55
})
55
56
}
Original file line number Diff line number Diff line change @@ -30,6 +30,7 @@ const (
30
30
FeatureSecurityMode = "security_mode"
31
31
FeatureSourceDateEpoch = "source_date_epoch"
32
32
FeatureCNINetwork = "cni_network"
33
+ FeatureContentCheck = "content_check"
33
34
)
34
35
35
36
var features = map [string ]struct {}{
@@ -56,6 +57,7 @@ var features = map[string]struct{}{
56
57
FeatureSecurityMode : {},
57
58
FeatureSourceDateEpoch : {},
58
59
FeatureCNINetwork : {},
60
+ FeatureContentCheck : {},
59
61
}
60
62
61
63
func CheckFeatureCompat (t * testing.T , sb integration.Sandbox , reason ... string ) {
You can’t perform that action at this time.
0 commit comments