Merge pull request #1234 from godaddy/godog-test-flags

[go cltf] add support for godog commandline flags
godaddy · Feb 18, 2025 · 5eeb9fa · 5eeb9fa
2 parents c0ab028 + 5b09aec
commit 5eeb9fa
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 12 deletions.
diff --git a/tests/cross-language/go/decrypt_test.go b/tests/cross-language/go/decrypt_test.go
@@ -96,11 +96,7 @@ func decryptedDataShouldBeEqualTo(payload string) error {
 }
 
 func TestDecryptFeatures(t *testing.T) {
-	opts := godog.Options{
-		Paths:    []string{"../features/decrypt.feature"},
-		Format:   "pretty",
-		TestingT: t,
-	}
+	opts := godogOptsWithDefaults(t, "../features/decrypt.feature")
 
 	status := godog.TestSuite{
 		Name:                 "decrypt",

diff --git a/tests/cross-language/go/encrypt_test.go b/tests/cross-language/go/encrypt_test.go
@@ -5,6 +5,7 @@ import (
 	"database/sql"
 	"encoding/base64"
 	"encoding/json"
+	"flag"
 	"fmt"
 	"os"
 	"testing"
@@ -22,8 +23,13 @@ var (
 	payloadString          string
 	encryptedPayloadString string
 	connection             *sql.DB
+	godogOpts              godog.Options
 )
 
+func init() {
+	godog.BindFlags("godog.", flag.CommandLine, &godogOpts)
+}
+
 func iHave(payload string) error {
 	payloadString = payload
 
@@ -146,13 +152,25 @@ func connectSQL() error {
 	return nil
 }
 
-func TestEncryptFeatures(t *testing.T) {
-	opts := godog.Options{
-		Paths:    []string{"../features/encrypt.feature"},
-		Format:   "pretty",
-		TestingT: t,
+func godogOptsWithDefaults(t *testing.T, defaultPath string) (opts godog.Options) {
+	opts = godogOpts
+
+	opts.TestingT = t
+
+	if opts.Paths == nil {
+		opts.Paths = []string{defaultPath}
+	}
+
+	if opts.Format == "" {
+		opts.Format = "pretty"
 	}
 
+	return
+}
+
+func TestEncryptFeatures(t *testing.T) {
+	opts := godogOptsWithDefaults(t, "../features/encrypt.feature")
+
 	status := godog.TestSuite{
 		Name:                 "encrypt",
 		TestSuiteInitializer: InitializeTestSuite,
@@ -164,3 +182,8 @@ func TestEncryptFeatures(t *testing.T) {
 		t.Fatal("Non-zero status returned")
 	}
 }
+
+func TestMain(m *testing.M) {
+	flag.Parse()
+	os.Exit(m.Run())
+}
diff --git a/tests/cross-language/scripts/decrypt_all.sh b/tests/cross-language/scripts/decrypt_all.sh
@@ -41,7 +41,7 @@ cd ..
 
 cd go
 echo "----------------------Decrypting data using Go--------------------------"
-go test -v -test.run '^TestDecryptFeatures$'
+go test -v -test.run '^TestDecryptFeatures$' -godog.paths=../features/decrypt.feature
 cd ..
 
 cd sidecar

diff --git a/tests/cross-language/scripts/encrypt_all.sh b/tests/cross-language/scripts/encrypt_all.sh
@@ -41,7 +41,7 @@ cd ..
 
 cd go
 echo "----------------------Encrypting payload using Go-----------------------"
-go test -v -test.run '^TestEncryptFeatures$'
+go test -v -test.run '^TestEncryptFeatures$' -godog.paths=../features/encrypt.feature
 cd ..
 
 cd sidecar