github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix unit tests and known flags list

Browse Source
This commit is contained in:
Bryan Boreham
2016-09-13 19:38:18 +00:00
committed by Bryan Boreham
parent fd4596bd27
commit db5fa5297d
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hack/verify-flags/known-flags.txt
View File

@@ -71,6 +71,8 @@ cluster-tag
cluster-monitor-period
cluster-signing-cert-file
cluster-signing-key-file
cni-bin-dir
cni-conf-dir
concurrent-deployment-syncs
concurrent-endpoint-syncs
concurrent-namespace-syncs

4
pkg/kubelet/network/cni/cni_test.go
View File

@@ -183,7 +183,7 @@ func TestCNIPlugin(t *testing.T) {
NetnsPath: "/proc/12345/ns/net",
}}
plugins := probeNetworkPluginsWithVendorCNIDirPrefix(path.Join(testNetworkConfigPath, pluginName), testVendorCNIDirPrefix)
plugins := probeNetworkPluginsWithVendorCNIDirPrefix(path.Join(testNetworkConfigPath, pluginName), "", testVendorCNIDirPrefix)
if len(plugins) != 1 {
t.Fatalf("Expected only one network plugin, got %d", len(plugins))
}
@@ -246,7 +246,7 @@ func TestCNIPlugin(t *testing.T) {
}
func TestLoNetNonNil(t *testing.T) {
if conf := getLoNetwork(""); conf == nil {
if conf := getLoNetwork("", ""); conf == nil {
t.Error("Expected non-nil lo network")
}
}