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
小 白蛋
Helm
Commits
255c4757
Unverified
Commit
255c4757
authored
8 years ago
by
Michelle Noorali
Committed by
Matt Butcher
8 years ago
Browse files
Options
Download
Email Patches
Plain Diff
ref(*): remove error if no tests found on test cmd
* resolves #1973
parent
3af33399
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
pkg/hooks/hooks.go
+2
-13
pkg/hooks/hooks.go
pkg/releasetesting/environment_test.go
+5
-5
pkg/releasetesting/environment_test.go
pkg/releasetesting/test_suite.go
+5
-4
pkg/releasetesting/test_suite.go
pkg/releasetesting/test_suite_test.go
+33
-4
pkg/releasetesting/test_suite_test.go
with
45 additions
and
26 deletions
+45
-26
pkg/hooks/hooks.go
+
2
-
13
View file @
255c4757
...
...
@@ -17,8 +17,6 @@ limitations under the License.
package
hooks
import
(
"errors"
"k8s.io/helm/pkg/proto/hapi/release"
)
...
...
@@ -40,13 +38,8 @@ const (
)
// FilterTestHooks filters the list of hooks are returns only testing hooks.
func
FilterTestHooks
(
hooks
[]
*
release
.
Hook
)
(
[]
*
release
.
Hook
,
error
)
{
func
FilterTestHooks
(
hooks
[]
*
release
.
Hook
)
[]
*
release
.
Hook
{
testHooks
:=
[]
*
release
.
Hook
{}
notFoundErr
:=
errors
.
New
(
"no tests found"
)
if
len
(
hooks
)
==
0
{
return
nil
,
notFoundErr
}
for
_
,
h
:=
range
hooks
{
for
_
,
e
:=
range
h
.
Events
{
...
...
@@ -57,9 +50,5 @@ func FilterTestHooks(hooks []*release.Hook) ([]*release.Hook, error) {
}
}
if
len
(
testHooks
)
==
0
{
return
nil
,
notFoundErr
}
return
testHooks
,
nil
return
testHooks
}
This diff is collapsed.
Click to expand it.
pkg/releasetesting/environment_test.go
+
5
-
5
View file @
255c4757
...
...
@@ -63,7 +63,7 @@ func TestDeleteTestPods(t *testing.T) {
mockTestEnv
.
DeleteTestPods
(
mockTestSuite
.
TestManifests
)
stream
:=
mockTestEnv
.
Stream
.
(
mockStream
)
stream
:=
mockTestEnv
.
Stream
.
(
*
mockStream
)
if
len
(
stream
.
messages
)
!=
0
{
t
.
Errorf
(
"Expected 0 errors, got at least one: %v"
,
stream
.
messages
)
}
...
...
@@ -82,9 +82,9 @@ func TestDeleteTestPodsFailingDelete(t *testing.T) {
mockTestEnv
.
DeleteTestPods
(
mockTestSuite
.
TestManifests
)
stream
:=
mockTestEnv
.
Stream
.
(
mockStream
)
if
len
(
stream
.
messages
)
=
=
1
{
t
.
Errorf
(
"Expected 1 error, got
none
: %v"
,
stream
.
messages
)
stream
:=
mockTestEnv
.
Stream
.
(
*
mockStream
)
if
len
(
stream
.
messages
)
!
=
1
{
t
.
Errorf
(
"Expected 1 error, got: %v"
,
len
(
stream
.
messages
)
)
}
}
...
...
@@ -100,7 +100,7 @@ func newMockTestingEnvironment() *MockTestingEnvironment {
Namespace
:
"default"
,
KubeClient
:
tEnv
.
KubeClient
,
Timeout
:
5
,
Stream
:
mockStream
{},
Stream
:
&
mockStream
{},
},
}
}
...
...
This diff is collapsed.
Click to expand it.
pkg/releasetesting/test_suite.go
+
5
-
4
View file @
255c4757
...
...
@@ -64,6 +64,10 @@ func NewTestSuite(rel *release.Release) (*TestSuite, error) {
func
(
ts
*
TestSuite
)
Run
(
env
*
Environment
)
error
{
ts
.
StartedAt
=
timeconv
.
Now
()
if
len
(
ts
.
TestManifests
)
==
0
{
env
.
streamMessage
(
"No Tests Found"
)
}
for
_
,
testManifest
:=
range
ts
.
TestManifests
{
test
,
err
:=
newTest
(
testManifest
)
if
err
!=
nil
{
...
...
@@ -147,10 +151,7 @@ func expectedSuccess(hookTypes []string) (bool, error) {
}
func
extractTestManifestsFromHooks
(
h
[]
*
release
.
Hook
)
([]
string
,
error
)
{
testHooks
,
err
:=
hooks
.
FilterTestHooks
(
h
)
if
err
!=
nil
{
return
nil
,
err
}
testHooks
:=
hooks
.
FilterTestHooks
(
h
)
tests
:=
[]
string
{}
for
_
,
h
:=
range
testHooks
{
...
...
This diff is collapsed.
Click to expand it.
pkg/releasetesting/test_suite_test.go
+
33
-
4
View file @
255c4757
...
...
@@ -139,6 +139,37 @@ func TestRun(t *testing.T) {
}
func
TestRunEmptyTestSuite
(
t
*
testing
.
T
)
{
ts
:=
testSuiteFixture
([]
string
{})
mockTestEnv
:=
testEnvFixture
()
if
err
:=
ts
.
Run
(
mockTestEnv
);
err
!=
nil
{
t
.
Errorf
(
"%s"
,
err
)
}
if
ts
.
StartedAt
==
nil
{
t
.
Errorf
(
"Expected StartedAt to not be nil. Got: %v"
,
ts
.
StartedAt
)
}
if
ts
.
CompletedAt
==
nil
{
t
.
Errorf
(
"Expected CompletedAt to not be nil. Got: %v"
,
ts
.
CompletedAt
)
}
if
len
(
ts
.
Results
)
!=
0
{
t
.
Errorf
(
"Expected 0 test result. Got %v"
,
len
(
ts
.
Results
))
}
stream
:=
mockTestEnv
.
Stream
.
(
*
mockStream
)
if
len
(
stream
.
messages
)
==
0
{
t
.
Errorf
(
"Expected at least one message, Got: %v"
,
len
(
stream
.
messages
))
}
else
{
msg
:=
stream
.
messages
[
0
]
.
Msg
if
msg
!=
"No Tests Found"
{
t
.
Errorf
(
"Expected message 'No Tests Found', Got: %v"
,
msg
)
}
}
}
func
TestRunSuccessWithTestFailureHook
(
t
*
testing
.
T
)
{
ts
:=
testSuiteFixture
([]
string
{
manifestWithTestFailureHook
})
env
:=
testEnvFixture
()
...
...
@@ -246,9 +277,6 @@ func testFixture() *test {
}
func
testSuiteFixture
(
testManifests
[]
string
)
*
TestSuite
{
if
len
(
testManifests
)
==
0
{
testManifests
=
[]
string
{
manifestWithTestSuccessHook
,
manifestWithTestFailureHook
}
}
testResults
:=
[]
*
release
.
TestRun
{}
ts
:=
&
TestSuite
{
TestManifests
:
testManifests
,
...
...
@@ -274,10 +302,11 @@ type mockStream struct {
messages
[]
*
services
.
TestReleaseResponse
}
func
(
rs
mockStream
)
Send
(
m
*
services
.
TestReleaseResponse
)
error
{
func
(
rs
*
mockStream
)
Send
(
m
*
services
.
TestReleaseResponse
)
error
{
rs
.
messages
=
append
(
rs
.
messages
,
m
)
return
nil
}
func
(
rs
mockStream
)
SetHeader
(
m
metadata
.
MD
)
error
{
return
nil
}
func
(
rs
mockStream
)
SendHeader
(
m
metadata
.
MD
)
error
{
return
nil
}
func
(
rs
mockStream
)
SetTrailer
(
m
metadata
.
MD
)
{}
...
...
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