github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 04:06:03 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #48137 from danwinship/utiltests

Browse Source 
Automatic merge from submit-queue

fixes to two pkg/util unit tests

Spun out from #46537. Trivial unit test fixes:
- `pkg/util/ebtables/ebtables_test.go`'s tests are incorrectly named and so weren't getting run by "go test". (And one of them had a typo in it so it failed after the name was fixed)
- In `pkg/util/iptables/iptables_test.go`, the deletion tests were apparently written by copying+pasting+editing the creation tests, but they forgot to change the names of the tests to match the behavior that was being tested in the new version
This commit is contained in:
Kubernetes Submit Queue 2017-06-28 21:55:48 -07:00 committed by GitHub
commit 3b35696460
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/util/ebtables/ebtables_test.go
View File

@ -23,7 +23,7 @@ import (
"k8s.io/kubernetes/pkg/util/exec"
)
func testEnsureChain(t *testing.T) {
func TestEnsureChain(t *testing.T) {
fcmd := exec.FakeCmd{
CombinedOutputScript: []exec.FakeCombinedOutputAction{
// Does not Exists
@ -75,7 +75,7 @@ func testEnsureChain(t *testing.T) {
}
}
func testEnsureRule(t *testing.T) {
func TestEnsureRule(t *testing.T) {
fcmd := exec.FakeCmd{
CombinedOutputScript: []exec.FakeCombinedOutputAction{
// Exists
@ -118,7 +118,7 @@ Bridge chain: TEST, entries: 0, policy: ACCEPT`), nil
if exists {
t.Errorf("expected exists = false")
}
errStr := "Failed to ensure rule: exist 2, output: "
errStr := "Failed to ensure rule: exit 2, output: "
if err == nil || err.Error() != errStr {
t.Errorf("expected error: %q", errStr)
}

6
pkg/util/iptables/iptables_test.go
View File

@ -333,7 +333,7 @@ func TestEnsureRuleErrorCreating(t *testing.T) {
}
}
func TestDeleteRuleAlreadyExists(t *testing.T) {
func TestDeleteRuleDoesNotExist(t *testing.T) {
fcmd := exec.FakeCmd{
CombinedOutputScript: []exec.FakeCombinedOutputAction{
// iptables version check
@ -368,7 +368,7 @@ func TestDeleteRuleAlreadyExists(t *testing.T) {
}
}
func TestDeleteRuleNew(t *testing.T) {
func TestDeleteRuleExists(t *testing.T) {
fcmd := exec.FakeCmd{
CombinedOutputScript: []exec.FakeCombinedOutputAction{
// iptables version check
@ -438,7 +438,7 @@ func TestDeleteRuleErrorChecking(t *testing.T) {
}
}
func TestDeleteRuleErrorCreating(t *testing.T) {
func TestDeleteRuleErrorDeleting(t *testing.T) {
fcmd := exec.FakeCmd{
CombinedOutputScript: []exec.FakeCombinedOutputAction{
// iptables version check