From 9d8e7a0e24aed9bd5b609ed7f492331ba9413cbb Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Thu, 4 Apr 2019 10:09:27 +0200 Subject: [PATCH] Remove some checkers to discourage usage Signed-off-by: Sebastiaan van Stijn (cherry picked from commit 86f2ac4a6b5b746c3309b57e7e04bdbdb70d46d7) Signed-off-by: Sebastiaan van Stijn Upstream-commit: 8fcca0be3f31e8296a3ceefcb10acca636673b15 Component: engine --- .../engine/integration-cli/checker/checker.go | 30 ++++--------------- components/engine/vendor.conf | 2 +- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/components/engine/integration-cli/checker/checker.go b/components/engine/integration-cli/checker/checker.go index d7fdc412ba..6b079c1fcd 100644 --- a/components/engine/integration-cli/checker/checker.go +++ b/components/engine/integration-cli/checker/checker.go @@ -9,38 +9,20 @@ import ( // As a commodity, we bring all check.Checker variables into the current namespace to avoid having // to think about check.X versus checker.X. var ( - DeepEquals = check.DeepEquals - ErrorMatches = check.ErrorMatches - FitsTypeOf = check.FitsTypeOf - HasLen = check.HasLen - Implements = check.Implements - IsNil = check.IsNil - Matches = check.Matches - Not = check.Not - NotNil = check.NotNil - PanicMatches = check.PanicMatches - Panics = check.Panics + DeepEquals = check.DeepEquals + HasLen = check.HasLen + IsNil = check.IsNil + Matches = check.Matches + Not = check.Not + NotNil = check.NotNil Contains = shakers.Contains - ContainsAny = shakers.ContainsAny Count = shakers.Count Equals = shakers.Equals - EqualFold = shakers.EqualFold False = shakers.False GreaterOrEqualThan = shakers.GreaterOrEqualThan GreaterThan = shakers.GreaterThan HasPrefix = shakers.HasPrefix - HasSuffix = shakers.HasSuffix - Index = shakers.Index - IndexAny = shakers.IndexAny - IsAfter = shakers.IsAfter - IsBefore = shakers.IsBefore - IsBetween = shakers.IsBetween - IsLower = shakers.IsLower - IsUpper = shakers.IsUpper LessOrEqualThan = shakers.LessOrEqualThan - LessThan = shakers.LessThan - TimeEquals = shakers.TimeEquals True = shakers.True - TimeIgnore = shakers.TimeIgnore ) diff --git a/components/engine/vendor.conf b/components/engine/vendor.conf index 02fcc8b561..da39f03235 100644 --- a/components/engine/vendor.conf +++ b/components/engine/vendor.conf @@ -12,7 +12,7 @@ github.com/kr/pty 5cf931ef8f github.com/mattn/go-shellwords v1.0.3 github.com/sirupsen/logrus v1.0.6 github.com/tchap/go-patricia v2.2.6 -github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3 +github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3 # v0.1.0 golang.org/x/net a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1 golang.org/x/sys ac767d655b305d4e9612f5f6e33120b9176c4ad4 github.com/docker/go-units 47565b4f722fb6ceae66b95f853feed578a4a51c # v0.3.3