github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #24339 from pwittrock/flaky

Browse Source 
Automatic merge from submit-queue

Don't clean up files on image-based tests since the instance will be …

…deleted anyway and this is flaky on CoreOS.
This commit is contained in:
k8s-merge-robot 2016-04-15 20:50:41 -07:00
commit c528080248
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e_node/e2e_node_suite_test.go
View File

@ -91,7 +91,7 @@ type LogReporter struct{}
func (lr *LogReporter) SpecSuiteWillBegin(config config.GinkgoConfigType, summary *types.SuiteSummary) { func (lr *LogReporter) SpecSuiteWillBegin(config config.GinkgoConfigType, summary *types.SuiteSummary) {
b := &bytes.Buffer{} b := &bytes.Buffer{}
b.WriteString("******************************************************\n") b.WriteString("******************************************************\n")
glog.V(2).Infof(b.String()) glog.V(0).Infof(b.String())
} }
func (lr *LogReporter) BeforeSuiteDidRun(setupSummary *types.SetupSummary) {} func (lr *LogReporter) BeforeSuiteDidRun(setupSummary *types.SetupSummary) {}
@ -115,5 +115,5 @@ func (lr *LogReporter) SpecSuiteDidEnd(summary *types.SuiteSummary) {
b.WriteString(fmt.Sprintf("etcd output:\n%s\n", e2es.etcdCombinedOut.String())) b.WriteString(fmt.Sprintf("etcd output:\n%s\n", e2es.etcdCombinedOut.String()))
} }
b.WriteString("******************************************************\n") b.WriteString("******************************************************\n")
glog.V(2).Infof(b.String()) glog.V(0).Infof(b.String())
} }

2
test/e2e_node/e2e_service.go
View File

@ -155,7 +155,7 @@ func (es *e2eService) startServer(cmd *healthCheckCommand) error {
go func() { go func() {
err := cmd.Run() err := cmd.Run()
if err != nil { if err != nil {
cmdErrorChan <- fmt.Errorf("%s Exited with status %v. Output:\n%v", cmd, err, *cmd.OutputBuffer) cmdErrorChan <- fmt.Errorf("%s Failed with error \"%v\". Command output:\n%s", cmd, err, *cmd.OutputBuffer)
} }
close(cmdErrorChan) close(cmdErrorChan)
}() }()

8
test/e2e_node/runner/run_e2e.go
View File

@ -122,7 +122,7 @@ func main() {
fmt.Printf("Initializing e2e tests using host %s.\n", host) fmt.Printf("Initializing e2e tests using host %s.\n", host)
running++ running++
go func(host string) { go func(host string) {
results <- testHost(host, archive) results <- testHost(host, archive, *cleanup)
}(host) }(host)
} }
} }
@ -150,8 +150,8 @@ func main() {
} }
// Run tests in archive against host // Run tests in archive against host
func testHost(host, archive string) *TestResult { func testHost(host, archive string, deleteFiles bool) *TestResult {
output, err := e2e_node.RunRemote(archive, host, *cleanup) output, err := e2e_node.RunRemote(archive, host, deleteFiles)
return &TestResult{ return &TestResult{
output: output, output: output,
err: err, err: err,
@ -171,7 +171,7 @@ func testImage(image, archive string) *TestResult {
err: fmt.Errorf("Unable to create gce instance with running docker daemon for image %s. %v", image, err), err: fmt.Errorf("Unable to create gce instance with running docker daemon for image %s. %v", image, err),
} }
} }
return testHost(host, archive) return testHost(host, archive, false)
} }
// Provision a gce instance using image // Provision a gce instance using image