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

Merge pull request #45645 from zjj2wry/kubectl-create-quota

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 46383, 45645, 45923, 44884, 46294)

Fix test not use test flags

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

**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**:
old code not use test.flags, now use it

**Release note**:

```release-note
```
This commit is contained in:
Kubernetes Submit Queue 2017-05-26 12:58:00 -07:00 committed by GitHub
commit 00acd84b28
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubectl/cmd/create_quota_test.go
View File

@ -47,30 +47,30 @@ func TestCreateQuota(t *testing.T) {
tf.Namespace = "test" tf.Namespace = "test"
tests := map[string]struct { tests := map[string]struct {
flags map[string]string flags []string
expectedOutput string expectedOutput string
}{ }{
"single resource": { "single resource": {
flags: map[string]string{"hard": "cpu=1", "output": "name"}, flags: []string{"--hard=cpu=1"},
expectedOutput: "resourcequota/" + resourceQuotaObject.Name + "\n", expectedOutput: "resourcequota/" + resourceQuotaObject.Name + "\n",
}, },
"single resource with a scope": { "single resource with a scope": {
flags: map[string]string{"hard": "cpu=1", "output": "name", "scopes": "BestEffort"}, flags: []string{"--hard=cpu=1", "--scopes=BestEffort"},
expectedOutput: "resourcequota/" + resourceQuotaObject.Name + "\n", expectedOutput: "resourcequota/" + resourceQuotaObject.Name + "\n",
}, },
"multiple resources": { "multiple resources": {
flags: map[string]string{"hard": "cpu=1,pods=42", "output": "name", "scopes": "BestEffort"}, flags: []string{"--hard=cpu=1,pods=42", "--scopes=BestEffort"},
expectedOutput: "resourcequota/" + resourceQuotaObject.Name + "\n", expectedOutput: "resourcequota/" + resourceQuotaObject.Name + "\n",
}, },
"single resource with multiple scopes": { "single resource with multiple scopes": {
flags: map[string]string{"hard": "cpu=1", "output": "name", "scopes": "BestEffort,NotTerminating"}, flags: []string{"--hard=cpu=1", "--scopes=BestEffort,NotTerminating"},
expectedOutput: "resourcequota/" + resourceQuotaObject.Name + "\n", expectedOutput: "resourcequota/" + resourceQuotaObject.Name + "\n",
}, },
} }
for name, test := range tests { for name, test := range tests {
buf := bytes.NewBuffer([]byte{}) buf := bytes.NewBuffer([]byte{})
cmd := NewCmdCreateQuota(f, buf) cmd := NewCmdCreateQuota(f, buf)
cmd.Flags().Set("hard", "cpu=1") cmd.Flags().Parse(test.flags)
cmd.Flags().Set("output", "name") cmd.Flags().Set("output", "name")
cmd.Run(cmd, []string{resourceQuotaObject.Name}) cmd.Run(cmd, []string{resourceQuotaObject.Name})