dependency: integrate github.com/mndrix/tap-go as internal package

cmd/runtimetest/main.go

@@ -14,8 +14,8 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/mndrix/tap-go"
 	rspec "github.com/opencontainers/runtime-spec/specs-go"
+	"github.com/opencontainers/runtime-tools/util/tap"
 	"github.com/sirupsen/logrus"
 	"github.com/syndtr/gocapability/capability"
 	"github.com/urfave/cli"

go.mod

@@ -6,7 +6,6 @@ require (
 	github.com/blang/semver/v4 v4.0.0
 	github.com/google/uuid v1.3.0
 	github.com/hashicorp/go-multierror v1.1.1
-	github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b
 	github.com/mrunalp/fileutils v0.5.0
 	github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb
 	github.com/opencontainers/selinux v1.9.1
@@ -16,6 +15,7 @@ require (
 	github.com/urfave/cli v1.19.1
 	github.com/xeipuuv/gojsonschema v1.2.0
 	golang.org/x/sys v0.0.0-20191115151921-52ab43148777
+	gopkg.in/yaml.v2 v2.4.0
 )
 
 require (
@@ -24,5 +24,4 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
 	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -9,8 +9,6 @@ github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/U
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
-github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b h1:Ga1nclDSe8gOw37MVLMhfu2QKWtD6gvtQ298zsKVh8g=
-github.com/mndrix/tap-go v0.0.0-20171203230836-629fa407e90b/go.mod h1:pzzDgJWZ34fGzaAZGFW22KVZDfyrYW+QABMrWnJBnSs=
 github.com/mrunalp/fileutils v0.5.0 h1:NKzVxiH7eSk+OQ4M+ZYW1K6h27RUV3MI6NUTsHhU6Z4=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
 github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb h1:1xSVPOd7/UA+39/hXEGnBJ13p6JFB0E1EvQFlrRDOXI=

vendor/github.com/mndrix/tap-go/README.md → util/tap/README.md

@@ -4,4 +4,7 @@ The [Test Anything Protocol](http://testanything.org/) ("TAP") is a text-based
 interface between tests and a test harness.  This package helps Go to generate
 TAP output.
 
-Read the [full package documentation](https://godoc.org/github.com/mndrix/tap-go)
+Read the [full package documentation](https://godoc.org/github.com/opencontainers/runtime-tools/util/tap)
+
+NOTE: This code was originally located at https://github.com/mndrix/tap-go and
+migrated to here as the project was archieved.

vendor/github.com/mndrix/tap-go/tap.go → util/tap/tap.go

@@ -1,32 +1,32 @@
 // Package tap provides support for automated Test Anything Protocol ("TAP")
 // tests in Go.  For example:
 //
-//		package main
+//	package main
 //
-//		import "github.com/mndrix/tap-go"
+//	import "github.com/opencontainers/runtime-tools/util/tap"
 //
-//		func main() {
-//			t := tap.New()
-//			t.Header(2)
-//			t.Ok(true, "first test")
-//			t.Ok(true, "second test")
-//		}
+//	func main() {
+//		t := tap.New()
+//		t.Header(2)
+//		t.Ok(true, "first test")
+//		t.Ok(true, "second test")
+//	}
 //
 // generates the following output
 //
-//		TAP version 13
-//		1..2
-//		ok 1 - first test
-//		ok 2 - second test
-package tap // import "github.com/mndrix/tap-go"
+//	TAP version 13
+//	1..2
+//	ok 1 - first test
+//	ok 2 - second test
+package tap
 
 import (
 	"fmt"
 	"io"
 	"os"
 	"strings"
+	"testing/quick"
 )
-import "testing/quick"
 
 // T is a type to encapsulate test state.  Methods on this type generate TAP
 // output.

util/tap/test/auto/main.go

@@ -0,0 +1,11 @@
+package main
+
+import "github.com/opencontainers/runtime-tools/util/tap"
+
+func main() {
+	t := tap.New()
+	t.Header(0)
+	t.Ok(true, "first test")
+	t.Ok(true, "second test")
+	t.AutoPlan()
+}

util/tap/test/check/main.go

@@ -0,0 +1,16 @@
+package main
+
+import "github.com/opencontainers/runtime-tools/util/tap"
+
+func main() {
+	add := func(x int) bool { return x+3 > x }
+	sub := func(x int) bool { return x-3 < x }
+	one := func(x int) bool { return x*1 == x }
+
+	t := tap.New()
+	t.Header(0)
+	t.Check(add, "addition makes numbers larger")
+	t.Check(sub, "subtraction makes numbers smaller")
+	t.Check(one, "1 is a multiplicative identity")
+	t.AutoPlan()
+}

util/tap/test/diagnostic/main.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"bytes"
+	"io"
+	"os"
+
+	tap "github.com/opencontainers/runtime-tools/util/tap"
+)
+
+func main() {
+	// collect output for comparison later
+	buf := new(bytes.Buffer)
+	t := tap.New()
+	t.Writer = io.MultiWriter(os.Stdout, buf)
+
+	t.Header(1)
+	t.Diagnostic("expecting all to be well")
+	t.Diagnosticf("here's some perfectly magical output: %d %s 0x%X.", 6, "abracadabra", 28)
+	t.Diagnostic("some\nmultiline\ntext\n")
+	t.Diagnosticf("%d lines\n%s multiline\ntext", 3, "more")
+
+	got := buf.String()
+	t.Ok(got == expected, "diagnostics gave expected output")
+}
+
+const expected = `TAP version 13
+1..1
+# expecting all to be well
+# here's some perfectly magical output: 6 abracadabra 0x1C.
+# some
+# multiline
+# text
+# 3 lines
+# more multiline
+# text
+`

util/tap/test/failing/main.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"bytes"
+
+	"github.com/opencontainers/runtime-tools/util/tap"
+)
+
+func main() {
+	t1 := tap.New()
+	t1.Header(2)
+
+	buf := new(bytes.Buffer)
+	t2 := tap.New()
+	t2.Writer = buf
+	t2.Header(2)
+
+	buf.Reset()
+	t2.Ok(false, "first test")
+	t1.Ok(buf.String() == "not ok 1 - first test\n", "Ok(false, ...) produces appropriate output")
+
+	buf.Reset()
+	t2.Fail("second test")
+	t1.Ok(buf.String() == "not ok 2 - second test\n", "Fail(...) produces appropriate output")
+}

util/tap/test/known/main.go

@@ -0,0 +1,10 @@
+package main
+
+import "github.com/opencontainers/runtime-tools/util/tap"
+
+func main() {
+	t := tap.New()
+	t.Header(2)
+	t.Ok(true, "first test")
+	t.Pass("second test")
+}

util/tap/test/skip/main.go

@@ -0,0 +1,30 @@
+package main
+
+import (
+	"bytes"
+	"io"
+	"os"
+
+	tap "github.com/opencontainers/runtime-tools/util/tap"
+)
+
+func main() {
+	// collect output for comparison later
+	buf := new(bytes.Buffer)
+	t := tap.New()
+	t.Writer = io.MultiWriter(os.Stdout, buf)
+
+	t.Header(4)
+	t.Skip(1, "insufficient flogiston pressure")
+	t.Skip(2, "no /sys directory")
+
+	got := buf.String()
+	t.Ok(got == expected, "skip gave expected output")
+}
+
+const expected = `TAP version 13
+1..4
+ok 1 # SKIP insufficient flogiston pressure
+ok 2 # SKIP no /sys directory
+ok 3 # SKIP no /sys directory
+`

util/tap/test/todo/main.go

@@ -0,0 +1,38 @@
+package main
+
+import (
+	"bytes"
+	"io"
+	"os"
+
+	tap "github.com/opencontainers/runtime-tools/util/tap"
+)
+
+func main() {
+	// collect output for comparison later
+	buf := new(bytes.Buffer)
+	t := tap.New()
+	t.Writer = io.MultiWriter(os.Stdout, buf)
+
+	t.Header(6)
+	t.TODO = true
+	t.Ok(false, "using Ok(false, ...) in TODO mode")
+	t.Fail("using Fail(...) in TODO mode")
+	t.TODO = false
+	t.Ok(true, "using Ok(false, ...) after leaving TODO mode")
+
+	t.Todo().Fail("using Fail(...) in TODO mode with method chaining")
+	t.Pass("using Pass(...) after Todo method chaining")
+
+	got := buf.String()
+	t.Ok(got == expected, "TODO gave expected output")
+}
+
+const expected = `TAP version 13
+1..6
+not ok 1 # TODO using Ok(false, ...) in TODO mode
+not ok 2 # TODO using Fail(...) in TODO mode
+ok 3 - using Ok(false, ...) after leaving TODO mode
+not ok 4 # TODO using Fail(...) in TODO mode with method chaining
+ok 5 - using Pass(...) after Todo method chaining
+`

util/tap/test/writer/main.go

@@ -0,0 +1,19 @@
+package main
+
+import (
+	"bytes"
+	"os"
+
+	"github.com/opencontainers/runtime-tools/util/tap"
+)
+
+func main() {
+	buf := new(bytes.Buffer)
+	t := tap.New()
+	t.Writer = buf
+	t.Header(2)
+	t.Ok(true, "a test")
+	t.Ok(buf.Len() > 0, "buffer has content")
+
+	buf.WriteTo(os.Stdout)
+}

util/tap/test/yaml/json.go

@@ -0,0 +1,14 @@
+// +build !yaml
+
+package main
+
+const expected = `TAP version 13
+1..2
+ok 1 - test for anchoring the YAML block
+  ---
+  {
+    "code": 3,
+    "message": "testing YAML blocks"
+  }
+  ...
+`

util/tap/test/yaml/main.go

@@ -0,0 +1,26 @@
+package main
+
+import (
+	"bytes"
+	"io"
+	"os"
+
+	tap "github.com/opencontainers/runtime-tools/util/tap"
+)
+
+func main() {
+	// collect output for comparison later
+	buf := new(bytes.Buffer)
+	t := tap.New()
+	t.Writer = io.MultiWriter(os.Stdout, buf)
+
+	t.Header(2)
+	t.Pass("test for anchoring the YAML block")
+	message := map[string]interface{}{
+		"message": "testing YAML blocks",
+		"code":    3,
+	}
+	t.YAML(message)
+	got := buf.String()
+	t.Ok(got == expected, "diagnostics gave expected output")
+}

util/tap/test/yaml/yaml.go

@@ -0,0 +1,12 @@
+// +build yaml
+
+package main
+
+const expected = `TAP version 13
+1..2
+ok 1 - test for anchoring the YAML block
+  ---
+  code: 3
+  message: testing YAML blocks
+  ...
+`

validation/config_updates_without_affect/config_updates_without_affect.go

@@ -7,11 +7,11 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	tap "github.com/mndrix/tap-go"
 	"github.com/mrunalp/fileutils"
 	rspec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/opencontainers/runtime-tools/specerror"
+	tap "github.com/opencontainers/runtime-tools/util/tap"
 	"github.com/opencontainers/runtime-tools/validation/util"
 )
 

validation/create/create.go

@@ -6,10 +6,10 @@ import (
 	"runtime"
 
 	"github.com/google/uuid"
-	"github.com/mndrix/tap-go"
 	rspecs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/opencontainers/runtime-tools/specerror"
+	"github.com/opencontainers/runtime-tools/util/tap"
 	"github.com/opencontainers/runtime-tools/validation/util"
 )
 

validation/delete/delete.go

@@ -5,12 +5,12 @@ import (
 	"os"
 	"time"
 
-	"github.com/mndrix/tap-go"
+	"github.com/google/uuid"
 	rspecs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/opencontainers/runtime-tools/specerror"
+	"github.com/opencontainers/runtime-tools/util/tap"
 	"github.com/opencontainers/runtime-tools/validation/util"
-	"github.com/google/uuid"
 )
 
 func main() {

validation/delete_only_create_resources/delete_only_create_resources.go

@@ -8,10 +8,10 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	tap "github.com/mndrix/tap-go"
 	"github.com/mrunalp/fileutils"
 	rspec "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/specerror"
+	tap "github.com/opencontainers/runtime-tools/util/tap"
 	"github.com/opencontainers/runtime-tools/validation/util"
 )