github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 15:58:37 +00:00
Code Issues Projects Releases Wiki Activity

Remove --orderseed and --times flags from the e2e test.

Browse Source 
Similar functionality for both is already provided by the Ginkgo runner
itself.
This commit is contained in:
Jeff Grafton 2015-04-29 16:59:15 -07:00
parent 57750ccb51
commit d85494220b
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test/e2e/e2e_test.go
View File

@ -40,9 +40,7 @@ type testResult bool
var ( var (
cloudConfig = &testContext.CloudConfig cloudConfig = &testContext.CloudConfig
orderseed = flag.Int64("orderseed", 0, "If non-zero, seed of random test shuffle order. (Otherwise random.)")
reportDir = flag.String("report-dir", "", "Path to the directory where the JUnit XML reports should be saved. Default is empty, which doesn't generate these reports.") reportDir = flag.String("report-dir", "", "Path to the directory where the JUnit XML reports should be saved. Default is empty, which doesn't generate these reports.")
times = flag.Int("times", 1, "Number of times each test is eligible to be run. Individual order is determined by shuffling --times instances of each test using --orderseed (like a multi-deck shoe of cards).")
) )
func init() { func init() {
@ -79,16 +77,13 @@ func TestE2E(t *testing.T) {
config.GinkgoConfig.SkipString = "Skipped" config.GinkgoConfig.SkipString = "Skipped"
} }
// TODO: Make orderseed work again.
gomega.RegisterFailHandler(ginkgo.Fail) gomega.RegisterFailHandler(ginkgo.Fail)
// Run the existing tests with output to console + JUnit for Jenkins // Run tests through the Ginkgo runner with output to console + JUnit for Jenkins
for i := 0; i < *times && !t.Failed(); i++ { var r []ginkgo.Reporter
var r []ginkgo.Reporter if *reportDir != "" {
if *reportDir != "" { r = append(r, reporters.NewJUnitReporter(path.Join(*reportDir, fmt.Sprintf("junit_%02d.xml", config.GinkgoConfig.ParallelNode))))
r = append(r, reporters.NewJUnitReporter(path.Join(*reportDir, fmt.Sprintf("junit_%d_%02d.xml", i+1, config.GinkgoConfig.ParallelNode))))
}
ginkgo.RunSpecsWithDefaultAndCustomReporters(t, fmt.Sprintf("Kubernetes e2e Suite run %d of %d", i+1, *times), r)
} }
ginkgo.RunSpecsWithDefaultAndCustomReporters(t, "Kubernetes e2e suite", r)
} }
func TestMain(m *testing.M) { func TestMain(m *testing.M) {
@ -102,10 +97,6 @@ func TestMain(m *testing.M) {
glog.Info("The --provider flag is not set. Treating as a conformance test. Some tests may not be run.") glog.Info("The --provider flag is not set. Treating as a conformance test. Some tests may not be run.")
os.Exit(1) os.Exit(1)
} }
if *times <= 0 {
glog.Error("Invalid --times (negative or no testing requested)!")
os.Exit(1)
}
if testContext.Provider == "aws" { if testContext.Provider == "aws" {
awsConfig := "[Global]\n" awsConfig := "[Global]\n"