github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #49207 from dixudx/remove_redundant_param_e2e_remote

Browse Source 
Automatic merge from submit-queue

remove redundant param in e2e_node/remote

**What this PR does / why we need it**:

* remove redundant param in e2e_node/remote/remote.go
* fix a small typo

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:

```release-note
None
```
This commit is contained in:
Kubernetes Submit Queue 2017-07-20 20:16:38 -07:00 committed by GitHub
commit 947700d146
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e_node/remote/remote.go
View File

@ -114,7 +114,7 @@ func RunRemote(suite TestSuite, archive string, host string, cleanup bool, image
// Do not log the output here, let the caller deal with the test output. // Do not log the output here, let the caller deal with the test output.
if err != nil { if err != nil {
aggErrs = append(aggErrs, err) aggErrs = append(aggErrs, err)
collectSystemLog(host, workspace) collectSystemLog(host)
} }
glog.V(2).Infof("Copying test artifacts from %q", host) glog.V(2).Infof("Copying test artifacts from %q", host)
@ -160,7 +160,7 @@ func getTestArtifacts(host, testDir string) error {
// collectSystemLog is a temporary hack to collect system log when encountered on // collectSystemLog is a temporary hack to collect system log when encountered on
// unexpected error. // unexpected error.
func collectSystemLog(host, workspace string) { func collectSystemLog(host string) {
// Encountered an unexpected error. The remote test harness may not // Encountered an unexpected error. The remote test harness may not
// have finished retrieved and stored all the logs in this case. Try // have finished retrieved and stored all the logs in this case. Try
// to get some logs for debugging purposes. // to get some logs for debugging purposes.
@ -171,7 +171,7 @@ func collectSystemLog(host, workspace string) {
logPath = fmt.Sprintf("/tmp/%s-%s", getTimestamp(), logName) logPath = fmt.Sprintf("/tmp/%s-%s", getTimestamp(), logName)
destPath = fmt.Sprintf("%s/%s-%s", *resultsDir, host, logName) destPath = fmt.Sprintf("%s/%s-%s", *resultsDir, host, logName)
) )
glog.V(2).Infof("Test failed unexpectedly. Attempting to retreiving system logs (only works for nodes with journald)") glog.V(2).Infof("Test failed unexpectedly. Attempting to retrieving system logs (only works for nodes with journald)")
// Try getting the system logs from journald and store it to a file. // Try getting the system logs from journald and store it to a file.
// Don't reuse the original test directory on the remote host because // Don't reuse the original test directory on the remote host because
// it could've be been removed if the node was rebooted. // it could've be been removed if the node was rebooted.