Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Nomad
Commits
088f51a3
Commit
088f51a3
authored
6 years ago
by
Alex Dadgar
Browse files
Options
Download
Email Patches
Plain Diff
skip e2e/vault if integration isn't set
parent
454c1d0e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GNUmakefile
+1
-0
GNUmakefile
e2e/vault/vault_test.go
+7
-0
e2e/vault/vault_test.go
with
8 additions
and
0 deletions
+8
-0
GNUmakefile
+
1
-
0
View file @
088f51a3
...
@@ -264,6 +264,7 @@ e2e-test: dev ## Run the Nomad e2e test suite
...
@@ -264,6 +264,7 @@ e2e-test: dev ## Run the Nomad e2e test suite
-cover
\
-cover
\
-timeout
=
900s
\
-timeout
=
900s
\
github.com/hashicorp/nomad/e2e/vault/
github.com/hashicorp/nomad/e2e/vault/
-
integration
.PHONY
:
clean
.PHONY
:
clean
clean
:
GOPATH=$(shell go env GOPATH)
clean
:
GOPATH=$(shell go env GOPATH)
...
...
This diff is collapsed.
Click to expand it.
e2e/vault/vault_test.go
+
7
-
0
View file @
088f51a3
...
@@ -4,6 +4,7 @@ import (
...
@@ -4,6 +4,7 @@ import (
"archive/zip"
"archive/zip"
"bytes"
"bytes"
"context"
"context"
"flag"
"fmt"
"fmt"
"io"
"io"
"io/ioutil"
"io/ioutil"
...
@@ -24,6 +25,8 @@ import (
...
@@ -24,6 +25,8 @@ import (
vapi
"github.com/hashicorp/vault/api"
vapi
"github.com/hashicorp/vault/api"
)
)
var
integration
=
flag
.
Bool
(
"integration"
,
false
,
"run integration tests"
)
// harness is used to retrieve the required Vault test binaries
// harness is used to retrieve the required Vault test binaries
type
harness
struct
{
type
harness
struct
{
t
*
testing
.
T
t
*
testing
.
T
...
@@ -171,6 +174,10 @@ func (h *harness) get(version string) error {
...
@@ -171,6 +174,10 @@ func (h *harness) get(version string) error {
// TestVaultCompatibility tests compatibility across Vault versions
// TestVaultCompatibility tests compatibility across Vault versions
func
TestVaultCompatibility
(
t
*
testing
.
T
)
{
func
TestVaultCompatibility
(
t
*
testing
.
T
)
{
if
!*
integration
{
t
.
Skip
(
"skipping test in non-integration mode."
)
}
h
:=
newHarness
(
t
)
h
:=
newHarness
(
t
)
vaultBinaries
:=
h
.
reconcile
()
vaultBinaries
:=
h
.
reconcile
()
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help