Skip to content
This repository was archived by the owner on Aug 30, 2024. It is now read-only.

Initial setup for integration tests #80

Merged
merged 19 commits into from
Jul 29, 2020
Merged

Initial setup for integration tests #80

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8b3f056
Initial setup for integration tests
cmoog Jul 28, 2020
8e8b215
Execute commands in container
cmoog Jul 28, 2020
2932fe9
Add RunCmd manual command
cmoog Jul 28, 2020
025e1bd
Adds working bind mount
cmoog Jul 28, 2020
f11304b
Adds github fmt, lint, test ci
cmoog Jul 28, 2020
5998ff1
Add integration action
cmoog Jul 28, 2020
1495867
Add initial coder tests
cmoog Jul 28, 2020
a7ac523
Doc comments only
cmoog Jul 28, 2020
5c118b8
Limit github action runs
cmoog Jul 28, 2020
50c4e75
Add GetResult Assertion
cmoog Jul 28, 2020
bf31666
Add host runner
cmoog Jul 28, 2020
f4fe567
Add tests for host runner
cmoog Jul 28, 2020
9d358a6
Adds headless login workaround
cmoog Jul 29, 2020
e6c79f5
Add verbose logging to integration tests
cmoog Jul 29, 2020
b5b93d4
Fix tcli log helpers
cmoog Jul 29, 2020
c451d16
Move tcli tests to tcli package
cmoog Jul 29, 2020
cafdd6f
Simplify assertion type
cmoog Jul 29, 2020
18b5f50
Cleanup when commands are executed in sh or not
cmoog Jul 29, 2020
692b219
Handle command failure better
cmoog Jul 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add GetResult Assertion
  • Loading branch information
@cmoog
cmoog committed Jul 28, 2020
commit 50c4e75b394447f654e74bfbc8789d6f0e947934
36 changes: 24 additions & 12 deletions ci/tcli/tcli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ func (a Assertable) Assert(t *testing.T, option ...Assertion) {
}
t.Run(name, func(t *testing.T) {
t.Parallel()
err := o.Valid(cmdResult)
err := o.Valid(&cmdResult)
assert.Success(t, name, err)
})
}
Expand All @@ -167,7 +167,7 @@ func (a Assertable) Assert(t *testing.T, option ...Assertion) {
// Assertion specifies an assertion on the given CommandResult.
// Pass custom Assertion types to cover special cases.
type Assertion interface {
Valid(r CommandResult) error
Valid(r *CommandResult) error
}

// Named is an optional extension of Assertion that provides a helpful label
Expand All @@ -184,11 +184,11 @@ type CommandResult struct {
}

type simpleFuncAssert struct {
valid func(r CommandResult) error
valid func(r *CommandResult) error
name string
}

func (s simpleFuncAssert) Valid(r CommandResult) error {
func (s simpleFuncAssert) Valid(r *CommandResult) error {
return s.valid(r)
}

Expand All @@ -204,7 +204,7 @@ func Success() Assertion {
// ExitCodeIs asserts that the command exited with the given code
func ExitCodeIs(code int) Assertion {
return simpleFuncAssert{
valid: func(r CommandResult) error {
valid: func(r *CommandResult) error {
if r.ExitCode != code {
return xerrors.Errorf("exit code of %v expected, got %v", code, r.ExitCode)
}
Expand All @@ -217,17 +217,29 @@ func ExitCodeIs(code int) Assertion {
// StdoutEmpty asserts that the command did not write any data to Stdout
func StdoutEmpty() Assertion {
return simpleFuncAssert{
valid: func(r CommandResult) error {
valid: func(r *CommandResult) error {
return empty("stdout", r.Stdout)
},
name: fmt.Sprintf("stdout-empty"),
}
}

// GetResult offers an escape hatch from tcli
// The passed pointer will be assigned to the commands *CommandResult
func GetResult(result **CommandResult) Assertion {
return simpleFuncAssert{
valid: func(r *CommandResult) error {
*result = r
return nil
},
name: "get-stdout",
}
}

// StderrEmpty asserts that the command did not write any data to Stderr
func StderrEmpty() Assertion {
return simpleFuncAssert{
valid: func(r CommandResult) error {
valid: func(r *CommandResult) error {
return empty("stderr", r.Stderr)
},
name: fmt.Sprintf("stderr-empty"),
Expand All @@ -237,7 +249,7 @@ func StderrEmpty() Assertion {
// StdoutMatches asserts that Stdout contains a substring which matches the given regexp
func StdoutMatches(pattern string) Assertion {
return simpleFuncAssert{
valid: func(r CommandResult) error {
valid: func(r *CommandResult) error {
return matches("stdout", pattern, r.Stdout)
},
name: fmt.Sprintf("stdout-matches"),
Expand All @@ -247,7 +259,7 @@ func StdoutMatches(pattern string) Assertion {
// StderrMatches asserts that Stderr contains a substring which matches the given regexp
func StderrMatches(pattern string) Assertion {
return simpleFuncAssert{
valid: func(r CommandResult) error {
valid: func(r *CommandResult) error {
return matches("stderr", pattern, r.Stderr)
},
name: fmt.Sprintf("stderr-matches"),
Expand All @@ -257,7 +269,7 @@ func StderrMatches(pattern string) Assertion {
// CombinedMatches asserts that either Stdout or Stderr a substring which matches the given regexp
func CombinedMatches(pattern string) Assertion {
return simpleFuncAssert{
valid: func(r CommandResult) error {
valid: func(r *CommandResult) error {
//stdoutValid := StdoutMatches(pattern).Valid(r)
//stderrValid := StderrMatches(pattern).Valid(r)
// TODO: combine errors
Expand Down Expand Up @@ -291,7 +303,7 @@ func empty(name string, a []byte) error {
// DurationLessThan asserts that the command completed in less than the given duration
func DurationLessThan(dur time.Duration) Assertion {
return simpleFuncAssert{
valid: func(r CommandResult) error {
valid: func(r *CommandResult) error {
if r.Duration > dur {
return xerrors.Errorf("expected duration less than %s, took %s", dur.String(), r.Duration.String())
}
Expand All @@ -304,7 +316,7 @@ func DurationLessThan(dur time.Duration) Assertion {
// DurationGreaterThan asserts that the command completed in greater than the given duration
func DurationGreaterThan(dur time.Duration) Assertion {
return simpleFuncAssert{
valid: func(r CommandResult) error {
valid: func(r *CommandResult) error {
if r.Duration < dur {
return xerrors.Errorf("expected duration greater than %s, took %s", dur.String(), r.Duration.String())
}
Expand Down