Skip to content

Commit 7bf2f1f

Browse files
committed
UPSTREAM: <carry>: export HandleFlags
openshift-rebase(v1.24):source=d1e53633876
1 parent 514f181 commit 7bf2f1f

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

Diff for: test/e2e/e2e_test.go

+1-10
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import (
3838
"k8s.io/klog/v2"
3939
conformancetestdata "k8s.io/kubernetes/test/conformance/testdata"
4040
"k8s.io/kubernetes/test/e2e/framework"
41-
"k8s.io/kubernetes/test/e2e/framework/config"
4241
"k8s.io/kubernetes/test/e2e/framework/testfiles"
4342
e2etestingmanifests "k8s.io/kubernetes/test/e2e/testing-manifests"
4443
testfixtures "k8s.io/kubernetes/test/fixtures"
@@ -64,20 +63,12 @@ import (
6463
_ "k8s.io/kubernetes/test/e2e/windows"
6564
)
6665

67-
// handleFlags sets up all flags and parses the command line.
68-
func handleFlags() {
69-
config.CopyFlags(config.Flags, flag.CommandLine)
70-
framework.RegisterCommonFlags(flag.CommandLine)
71-
framework.RegisterClusterFlags(flag.CommandLine)
72-
flag.Parse()
73-
}
74-
7566
func TestMain(m *testing.M) {
7667
var versionFlag bool
7768
flag.CommandLine.BoolVar(&versionFlag, "version", false, "Displays version information.")
7869

7970
// Register test flags, then parse flags.
80-
handleFlags()
71+
HandleFlags()
8172

8273
if framework.TestContext.ListImages {
8374
for _, v := range image.GetImageConfigs() {

Diff for: test/e2e/patch_e2e.go

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package e2e
2+
3+
import (
4+
"flag"
5+
6+
"k8s.io/kubernetes/test/e2e/framework"
7+
"k8s.io/kubernetes/test/e2e/framework/config"
8+
)
9+
10+
func HandleFlags() {
11+
config.CopyFlags(config.Flags, flag.CommandLine)
12+
framework.RegisterCommonFlags(flag.CommandLine)
13+
framework.RegisterClusterFlags(flag.CommandLine)
14+
flag.Parse()
15+
}

0 commit comments

Comments
 (0)