From e4cff825178c07d5f3d68cb5f61e94c4a8beccdf Mon Sep 17 00:00:00 2001 From: Onsi Fakhouri Date: Wed, 7 Apr 2021 05:59:24 -0600 Subject: [PATCH] v1.16.1 Supress deprecation warning for --stream on windows. Fixes #793 --- CHANGELOG.md | 5 +++++ config/config.go | 2 +- ginkgo/run_command.go | 3 ++- types/deprecation_support.go | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f99f89480..4e0afc291 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 1.16.1 + +### Fixes +- Supress --stream deprecation warning on windows (#793) + ## 1.16.0 ### Features diff --git a/config/config.go b/config/config.go index 25f8758a6..5f4a4c26e 100644 --- a/config/config.go +++ b/config/config.go @@ -20,7 +20,7 @@ import ( "fmt" ) -const VERSION = "1.16.0" +const VERSION = "1.16.1" type GinkgoConfigType struct { RandomSeed int64 diff --git a/ginkgo/run_command.go b/ginkgo/run_command.go index dd87e1f89..47b586d93 100644 --- a/ginkgo/run_command.go +++ b/ginkgo/run_command.go @@ -6,6 +6,7 @@ import ( "math/rand" "os" "regexp" + "runtime" "strings" "time" @@ -56,7 +57,7 @@ func (r *SpecRunner) RunSpecs(args []string, additionalArgs []string) { deprecationTracker := types.NewDeprecationTracker() - if r.commandFlags.ParallelStream { + if r.commandFlags.ParallelStream && (runtime.GOOS != "windows") { deprecationTracker.TrackDeprecation(types.Deprecation{ Message: "--stream is deprecated and will be removed in Ginkgo 2.0", DocLink: "removed--stream", diff --git a/types/deprecation_support.go b/types/deprecation_support.go index c7bbfbf41..7f7a9aeb8 100644 --- a/types/deprecation_support.go +++ b/types/deprecation_support.go @@ -81,7 +81,7 @@ func (d *DeprecationTracker) DeprecationsReport() string { out += formatter.F("{{light-yellow}}============================================={{/}}\n") out += formatter.F("Ginkgo 2.0 is under active development and will introduce (a small number of) breaking changes.\n") out += formatter.F("To learn more, view the migration guide at {{cyan}}{{underline}}https://github.com/onsi/ginkgo/blob/v2/docs/MIGRATING_TO_V2.md{{/}}\n") - out += formatter.F("To comment, chime in at {{cyan}}{{underline}}https://github.com/onsi/ginkgo/issues/711{{/}}\n") + out += formatter.F("To comment, chime in at {{cyan}}{{underline}}https://github.com/onsi/ginkgo/issues/711{{/}}\n\n") for deprecation, locations := range d.deprecations { out += formatter.Fi(1, "{{yellow}}"+deprecation.Message+"{{/}}\n")