From f08be7f5faaae51100c77489f5c1753eae7321f2 Mon Sep 17 00:00:00 2001
From: "Paul \"TBBle\" Hampson" <Paul.Hampson@Pobox.com>
Date: Sun, 1 Mar 2020 22:55:48 +1100
Subject: [PATCH] Skip tests failures due to use of containerd 1.3 API

Per https://github.com/moby/buildkit/pull/1314#discussion_r365633635
BuildKit should still function with containerd 1.2 daemons that do not
have this API, but less efficiently.

However, a couple of hundred tests fail on CI when they hit this, so
just skip them for now.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
---
 util/testutil/integration/run.go     | 11 ++++++++++-
 util/testutil/integration/sandbox.go | 17 +++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/util/testutil/integration/run.go b/util/testutil/integration/run.go
index 19f66ef9fc8f..3032c33d053c 100644
--- a/util/testutil/integration/run.go
+++ b/util/testutil/integration/run.go
@@ -10,6 +10,7 @@ import (
 	"os/exec"
 	"path/filepath"
 	"reflect"
+	"regexp"
 	"runtime"
 	"sort"
 	"strings"
@@ -37,6 +38,7 @@ type Sandbox interface {
 
 	Cmd(...string) *exec.Cmd
 	PrintLogs(*testing.T)
+	MatchLogs(*regexp.Regexp) bool
 	NewRegistry() (string, error)
 	Value(string) interface{} // chosen matrix value
 }
@@ -137,6 +139,9 @@ func Run(t *testing.T, testCases []Test, opt ...TestOpt) {
 		list = []Worker{list[rand.Intn(len(list))]}
 	}
 
+	containerd1_2ExpectedFailureRegexp := regexp.MustCompile(` unknown method AddResource for service containerd\.services\.leases\.v1\.Leases: not implemented$`)
+	containerd1_2ExpectedFailureMessage := "containerd 1.2 does not support service containerd.services.leases.v1.Leases method AddResource"
+
 	for _, br := range list {
 		for _, tc := range testCases {
 			for _, mv := range matrix {
@@ -158,7 +163,11 @@ func Run(t *testing.T, testCases []Test, opt ...TestOpt) {
 						defer func() {
 							assert.NoError(t, closer())
 							if t.Failed() {
-								sb.PrintLogs(t)
+								if sb.MatchLogs(containerd1_2ExpectedFailureRegexp) {
+									t.Skip(containerd1_2ExpectedFailureMessage)
+								} else {
+									sb.PrintLogs(t)
+								}
 							}
 						}()
 						tc(t, sb)
diff --git a/util/testutil/integration/sandbox.go b/util/testutil/integration/sandbox.go
index 55d8ce5e3010..4780eb8714fd 100644
--- a/util/testutil/integration/sandbox.go
+++ b/util/testutil/integration/sandbox.go
@@ -8,6 +8,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"regexp"
 	"runtime"
 	"strings"
 	"syscall"
@@ -46,6 +47,10 @@ func (sb *sandbox) PrintLogs(t *testing.T) {
 	printLogs(sb.logs, t.Log)
 }
 
+func (sb *sandbox) MatchLogs(matchRegexp *regexp.Regexp) bool {
+	return matchLogs(sb.logs, matchRegexp)
+}
+
 func (sb *sandbox) NewRegistry() (string, error) {
 	url, cl, err := NewRegistry("")
 	if err != nil {
@@ -212,3 +217,15 @@ func printLogs(logs map[string]*bytes.Buffer, f func(args ...interface{})) {
 		}
 	}
 }
+
+func matchLogs(logs map[string]*bytes.Buffer, matchRegexp *regexp.Regexp) bool {
+	for _, l := range logs {
+		s := bufio.NewScanner(l)
+		for s.Scan() {
+			if matchRegexp.MatchString(s.Text()) {
+				return true
+			}
+		}
+	}
+	return false
+}