github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #69695 from justinsb/service_utils_typos 

e2e: fix some small typos
pull/58/head
k8s-ci-robot 2018-10-11 20:46:30 -07:00 committed by GitHub
parent b516a99a01 ee1b0c81a7
commit e1a1aa2112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e/e2e.go
View File

@ -222,12 +222,12 @@ var _ = ginkgo.SynchronizedBeforeSuite(func() []byte {
} }
}) })
// Similar to SynchornizedBeforeSuite, we want to run some operations only once (such as collecting cluster logs). // Similar to SynchronizedBeforeSuite, we want to run some operations only once (such as collecting cluster logs).
// Here, the order of functions is reversed; first, the function which runs everywhere, // Here, the order of functions is reversed; first, the function which runs everywhere,
// and then the function that only runs on the first Ginkgo node. // and then the function that only runs on the first Ginkgo node.
var _ = ginkgo.SynchronizedAfterSuite(func() { var _ = ginkgo.SynchronizedAfterSuite(func() {
// Run on all Ginkgo nodes // Run on all Ginkgo nodes
framework.Logf("Running AfterSuite actions on all node") framework.Logf("Running AfterSuite actions on all nodes")
framework.RunCleanupActions() framework.RunCleanupActions()
}, func() { }, func() {
// Run only Ginkgo on node 1 // Run only Ginkgo on node 1

6
test/e2e/framework/service_util.go
View File

@ -1523,7 +1523,7 @@ func CheckAffinity(jig *ServiceTestJig, execPod *v1.Pod, targetIp string, target
} }
if shouldHold { if shouldHold {
if !transitionState && !affinityHolds { if !transitionState && !affinityHolds {
return true, fmt.Errorf("Affintity should hold but didn't.") return true, fmt.Errorf("Affinity should hold but didn't.")
} }
if trackerFulfilled && affinityHolds { if trackerFulfilled && affinityHolds {
return true, nil return true, nil
@ -1540,9 +1540,9 @@ func CheckAffinity(jig *ServiceTestJig, execPod *v1.Pod, targetIp string, target
checkAffinityFailed(tracker, fmt.Sprintf("Connection to %s timed out or not enough responses.", targetIpPort)) checkAffinityFailed(tracker, fmt.Sprintf("Connection to %s timed out or not enough responses.", targetIpPort))
} }
if shouldHold { if shouldHold {
checkAffinityFailed(tracker, "Affintity should hold but didn't.") checkAffinityFailed(tracker, "Affinity should hold but didn't.")
} else { } else {
checkAffinityFailed(tracker, "Affintity shouldn't hold but did.") checkAffinityFailed(tracker, "Affinity shouldn't hold but did.")
} }
return true return true
} }