luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Merge pull request #8296 from hashicorp/b-tests-cleanup-20200625

Browse source 
Cleanup for command package tests
This commit is contained in:
Mahmood Ali 2020-06-26 09:31:41 -04:00 committed by GitHub
parent 35b87e2b89 30492e8119
commit ee6fbcbc0f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 31 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
command/acl_policy_apply_test.go
View file

@ -42,13 +42,11 @@ func TestACLPolicyApplyCommand(t *testing.T) {
assert.Nil(err)
// Attempt to apply a policy without a valid management token
os.Setenv("NOMAD_TOKEN", "foo")
code := cmd.Run([]string{"-address=" + url, "test-policy", f.Name()})
code := cmd.Run([]string{"-address=" + url, "-token=foo", "test-policy", f.Name()})
assert.Equal(1, code)
// Apply a policy with a valid management token
os.Setenv("NOMAD_TOKEN", token.SecretID)
code = cmd.Run([]string{"-address=" + url, "test-policy", f.Name()})
code = cmd.Run([]string{"-address=" + url, "-token=" + token.SecretID, "test-policy", f.Name()})
assert.Equal(0, code)
// Check the output

7
command/acl_policy_delete_test.go
View file

@ -2,7 +2,6 @@ package command
import (
"fmt"
"os"
"strings"
"testing"
@ -42,13 +41,11 @@ func TestACLPolicyDeleteCommand(t *testing.T) {
// Delete the policy without a valid token fails
invalidToken := mock.ACLToken()
os.Setenv("NOMAD_TOKEN", invalidToken.SecretID)
code := cmd.Run([]string{"-address=" + url, policy.Name})
code := cmd.Run([]string{"-address=" + url, "-token=" + invalidToken.SecretID, policy.Name})
assert.Equal(1, code)
// Delete the policy with a valid management token
os.Setenv("NOMAD_TOKEN", token.SecretID)
code = cmd.Run([]string{"-address=" + url, policy.Name})
code = cmd.Run([]string{"-address=" + url, "-token=" + token.SecretID, policy.Name})
assert.Equal(0, code)
// Check the output

7
command/acl_policy_info_test.go
View file

@ -1,7 +1,6 @@
package command
import (
"os"
"strings"
"testing"
@ -40,13 +39,11 @@ func TestACLPolicyInfoCommand(t *testing.T) {
// Attempt to apply a policy without a valid management token
invalidToken := mock.ACLToken()
os.Setenv("NOMAD_TOKEN", invalidToken.SecretID)
code := cmd.Run([]string{"-address=" + url, policy.Name})
code := cmd.Run([]string{"-address=" + url, "-token=" + invalidToken.SecretID, policy.Name})
assert.Equal(1, code)
// Apply a policy with a valid management token
os.Setenv("NOMAD_TOKEN", token.SecretID)
code = cmd.Run([]string{"-address=" + url, policy.Name})
code = cmd.Run([]string{"-address=" + url, "-token=" + token.SecretID, policy.Name})
assert.Equal(0, code)
// Check the output

7
command/acl_token_create_test.go
View file

@ -1,7 +1,6 @@
package command
import (
"os"
"strings"
"testing"
@ -28,13 +27,11 @@ func TestACLTokenCreateCommand(t *testing.T) {
cmd := &ACLTokenCreateCommand{Meta: Meta{Ui: ui, flagAddress: url}}
// Request to create a new token without providing a valid management token
os.Setenv("NOMAD_TOKEN", "foo")
code := cmd.Run([]string{"-address=" + url, "-policy=foo", "-type=client"})
code := cmd.Run([]string{"-address=" + url, "-token=foo", "-policy=foo", "-type=client"})
assert.Equal(1, code)
// Request to create a new token with a valid management token
os.Setenv("NOMAD_TOKEN", token.SecretID)
code = cmd.Run([]string{"-address=" + url, "-policy=foo", "-type=client"})
code = cmd.Run([]string{"-address=" + url, "-token=" + token.SecretID, "-policy=foo", "-type=client"})
assert.Equal(0, code)
// Check the output

7
command/acl_token_delete_test.go
View file

@ -2,7 +2,6 @@ package command
import (
"fmt"
"os"
"strings"
"testing"
@ -40,14 +39,12 @@ func TestACLTokenDeleteCommand_ViaEnvVariable(t *testing.T) {
// Attempt to delete a token without providing a valid token with delete
// permissions
os.Setenv("NOMAD_TOKEN", "foo")
code := cmd.Run([]string{"-address=" + url, mockToken.AccessorID})
code := cmd.Run([]string{"-address=" + url, "-token=foo", mockToken.AccessorID})
assert.Equal(1, code)
// Delete a token using a valid management token set via an environment
// variable
os.Setenv("NOMAD_TOKEN", token.SecretID)
code = cmd.Run([]string{"-address=" + url, mockToken.AccessorID})
code = cmd.Run([]string{"-address=" + url, "-token=" + token.SecretID, mockToken.AccessorID})
assert.Equal(0, code)
// Check the output

2
command/acl_token_info_test.go
View file

@ -14,6 +14,8 @@ import (
)
func TestACLTokenInfoCommand_ViaEnvVar(t *testing.T) {
defer os.Setenv("NOMAD_TOKEN", os.Getenv("NOMAD_TOKEN"))
assert := assert.New(t)
t.Parallel()
config := func(c *agent.Config) {

2
command/acl_token_self_test.go
View file

@ -14,6 +14,8 @@ import (
)
func TestACLTokenSelfCommand_ViaEnvVar(t *testing.T) {
defer os.Setenv("NOMAD_TOKEN", os.Getenv("NOMAD_TOKEN"))
assert := assert.New(t)
t.Parallel()
config := func(c *agent.Config) {

7
command/job_plan_test.go
View file

@ -1,7 +1,6 @@
package command
import (
"fmt"
"io/ioutil"
"os"
"strconv"
@ -21,13 +20,13 @@ func TestPlanCommand_Implements(t *testing.T) {
func TestPlanCommand_Fails(t *testing.T) {
t.Parallel()
ui := new(cli.MockUi)
cmd := &JobPlanCommand{Meta: Meta{Ui: ui}}
// Create a server
s := testutil.NewTestServer(t, nil)
defer s.Stop()
os.Setenv("NOMAD_ADDR", fmt.Sprintf("http://%s", s.HTTPAddr))
ui := new(cli.MockUi)
cmd := &JobPlanCommand{Meta: Meta{Ui: ui, flagAddress: "http://" + s.HTTPAddr}}
// Fails on misuse
if code := cmd.Run([]string{"some", "bad", "args"}); code != 255 {

7
command/job_run_test.go
View file

@ -1,7 +1,6 @@
package command
import (
"fmt"
"io/ioutil"
"os"
"strings"
@ -54,13 +53,13 @@ job "job1" {
func TestRunCommand_Fails(t *testing.T) {
t.Parallel()
ui := new(cli.MockUi)
cmd := &JobRunCommand{Meta: Meta{Ui: ui}}
// Create a server
s := testutil.NewTestServer(t, nil)
defer s.Stop()
os.Setenv("NOMAD_ADDR", fmt.Sprintf("http://%s", s.HTTPAddr))
ui := new(cli.MockUi)
cmd := &JobRunCommand{Meta: Meta{Ui: ui, flagAddress: "http://" + s.HTTPAddr}}
// Fails on misuse
if code := cmd.Run([]string{"some", "bad", "args"}); code != 1 {

20
command/job_validate_test.go
View file

@ -1,7 +1,6 @@
package command
import (
"fmt"
"io/ioutil"
"os"
"strings"
@ -18,13 +17,12 @@ func TestValidateCommand_Implements(t *testing.T) {
func TestValidateCommand(t *testing.T) {
t.Parallel()
ui := new(cli.MockUi)
cmd := &JobValidateCommand{Meta: Meta{Ui: ui}}
// Create a server
s := testutil.NewTestServer(t, nil)
defer s.Stop()
os.Setenv("NOMAD_ADDR", fmt.Sprintf("http://%s", s.HTTPAddr))
ui := new(cli.MockUi)
cmd := &JobValidateCommand{Meta: Meta{Ui: ui, flagAddress: "http://" + s.HTTPAddr}}
fh, err := ioutil.TempFile("", "nomad")
if err != nil {
@ -122,15 +120,15 @@ func TestValidateCommand_From_STDIN(t *testing.T) {
t.Fatalf("err: %s", err)
}
ui := new(cli.MockUi)
cmd := &JobValidateCommand{
Meta: Meta{Ui: ui},
JobGetter: JobGetter{testStdin: stdinR},
}
// Create a server
s := testutil.NewTestServer(t, nil)
defer s.Stop()
os.Setenv("NOMAD_ADDR", fmt.Sprintf("http://%s", s.HTTPAddr))
ui := new(cli.MockUi)
cmd := &JobValidateCommand{
Meta: Meta{Ui: ui, flagAddress: "http://" + s.HTTPAddr},
JobGetter: JobGetter{testStdin: stdinR},
}
go func() {
stdinW.WriteString(`

2
command/server_members_test.go
View file

@ -88,7 +88,7 @@ func TestServerMembersCommand_MultiRegion_Leave(t *testing.T) {
}
srv2, _, _ := testServer(t, false, config2)
defer srv1.Shutdown()
defer srv2.Shutdown()
// Join with srv1
addr := fmt.Sprintf("127.0.0.1:%d",

1
command/util_test.go
View file

@ -17,6 +17,7 @@ func testServer(t *testing.T, runClient bool, cb func(*agent.Config)) (*agent.Te
cb(config)
}
})
t.Cleanup(func() { a.Shutdown() })
c := a.Client()
return a, c, a.HTTPAddr()