Skip to content

Commit

Permalink
Fix api/uniter test race and a lint issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@wallyworld
wallyworld committed Jun 2, 2020
1 parent 1f195d8 commit 025aa88
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 82 deletions.
165 changes: 90 additions & 75 deletions api/uniter/application_test.go
View file
Expand Up @@ -4,7 +4,10 @@
package uniter_test

import (
"time"

"github.com/juju/names/v4"
"github.com/juju/testing"
jc "github.com/juju/testing/checkers"
gc "gopkg.in/check.v1"

Expand All @@ -20,89 +23,96 @@ import (
type applicationSuite struct {
coretesting.BaseSuite

apiCaller basetesting.APICallerFunc
life life.Value
statusSet bool
apiCallerFunc func(*gc.C) basetesting.APICallerFunc
life life.Value
statusSet bool
}

var _ = gc.Suite(&applicationSuite{})

func (s *applicationSuite) SetUpTest(c *gc.C) {
s.BaseSuite.SetUpTest(c)
s.life = life.Alive
s.apiCaller = func(objType string, version int, id, request string, arg, result interface{}) error {
c.Assert(objType, gc.Equals, "Uniter")
switch request {
case "Life":
c.Assert(arg, gc.DeepEquals, params.Entities{Entities: []params.Entity{{Tag: "application-mysql"}}})
c.Assert(result, gc.FitsTypeOf, &params.LifeResults{})
*(result.(*params.LifeResults)) = params.LifeResults{
Results: []params.LifeResult{{
Life: s.life,
}},
}
case "Watch":
c.Assert(arg, gc.DeepEquals, params.Entities{Entities: []params.Entity{{Tag: "application-mysql"}}})
c.Assert(result, gc.FitsTypeOf, &params.NotifyWatchResults{})
*(result.(*params.NotifyWatchResults)) = params.NotifyWatchResults{
Results: []params.NotifyWatchResult{{
NotifyWatcherId: "1",
}},
}
case "CharmURL":
c.Assert(arg, gc.DeepEquals, params.Entities{Entities: []params.Entity{{Tag: "application-mysql"}}})
c.Assert(result, gc.FitsTypeOf, &params.StringBoolResults{})
*(result.(*params.StringBoolResults)) = params.StringBoolResults{
Results: []params.StringBoolResult{{
Result: "cs:mysql",
Ok: true,
}},
}
case "CharmModifiedVersion":
c.Assert(arg, gc.DeepEquals, params.Entities{Entities: []params.Entity{{Tag: "application-mysql"}}})
c.Assert(result, gc.FitsTypeOf, &params.IntResults{})
*(result.(*params.IntResults)) = params.IntResults{
Results: []params.IntResult{{
Result: 1,
}},
s.apiCallerFunc = func(c *gc.C) basetesting.APICallerFunc {
return func(objType string, version int, id, request string, arg, result interface{}) error {
if objType == "NotifyWatcher" {
if request != "Next" && request != "Stop" {
c.Fatalf("unexpected watcher request %q", request)
}
return nil
}
case "ApplicationStatus":
c.Assert(arg, gc.DeepEquals, params.Entities{Entities: []params.Entity{{Tag: "unit-mysql-0"}}})
c.Assert(result, gc.FitsTypeOf, &params.ApplicationStatusResults{})
*(result.(*params.ApplicationStatusResults)) = params.ApplicationStatusResults{
Results: []params.ApplicationStatusResult{{
Application: params.StatusResult{Status: "alive"},
Units: map[string]params.StatusResult{
"unit-mysql-0": {Status: "dying"},
c.Assert(objType, gc.Equals, "Uniter")
switch request {
case "Life":
c.Assert(arg, jc.DeepEquals, params.Entities{Entities: []params.Entity{{Tag: "application-mysql"}}})
c.Assert(result, gc.FitsTypeOf, &params.LifeResults{})
*(result.(*params.LifeResults)) = params.LifeResults{
Results: []params.LifeResult{{
Life: s.life,
}},
}
case "Watch":
c.Assert(arg, jc.DeepEquals, params.Entities{Entities: []params.Entity{{Tag: "application-mysql"}}})
c.Assert(result, gc.FitsTypeOf, &params.NotifyWatchResults{})
*(result.(*params.NotifyWatchResults)) = params.NotifyWatchResults{
Results: []params.NotifyWatchResult{{
NotifyWatcherId: "1",
}},
}
case "CharmURL":
c.Assert(arg, jc.DeepEquals, params.Entities{Entities: []params.Entity{{Tag: "application-mysql"}}})
c.Assert(result, gc.FitsTypeOf, &params.StringBoolResults{})
*(result.(*params.StringBoolResults)) = params.StringBoolResults{
Results: []params.StringBoolResult{{
Result: "cs:mysql",
Ok: true,
}},
}
case "CharmModifiedVersion":
c.Assert(arg, jc.DeepEquals, params.Entities{Entities: []params.Entity{{Tag: "application-mysql"}}})
c.Assert(result, gc.FitsTypeOf, &params.IntResults{})
*(result.(*params.IntResults)) = params.IntResults{
Results: []params.IntResult{{
Result: 1,
}},
}
case "ApplicationStatus":
c.Assert(arg, jc.DeepEquals, params.Entities{Entities: []params.Entity{{Tag: "unit-mysql-0"}}})
c.Assert(result, gc.FitsTypeOf, &params.ApplicationStatusResults{})
*(result.(*params.ApplicationStatusResults)) = params.ApplicationStatusResults{
Results: []params.ApplicationStatusResult{{
Application: params.StatusResult{Status: "alive"},
Units: map[string]params.StatusResult{
"unit-mysql-0": {Status: "dying"},
},
}},
}
case "SetApplicationStatus":
c.Assert(arg, jc.DeepEquals, params.SetStatus{
Entities: []params.EntityStatusArgs{
{
Tag: "unit-mysql-0",
Status: "blocked",
Info: "app blocked",
Data: map[string]interface{}{"foo": "bar"},
},
},
}},
})
c.Assert(result, gc.FitsTypeOf, &params.ErrorResults{})
*(result.(*params.ErrorResults)) = params.ErrorResults{
Results: []params.ErrorResult{{}},
}
s.statusSet = true
default:
c.Fatalf("unexpected api call %q", request)
}
case "SetApplicationStatus":
c.Assert(arg, gc.DeepEquals, params.Entities{Entities: []params.Entity{{Tag: "unit-mysql-0"}}})
c.Assert(result, gc.FitsTypeOf, &params.ApplicationStatusResults{})
c.Assert(arg, jc.DeepEquals, params.SetStatus{
Entities: []params.EntityStatusArgs{
{
Tag: "unit-mysql-0",
Status: "blocked",
Info: "app blocked",
Data: map[string]interface{}{"foo": "bar"},
},
},
})
*(result.(*params.ErrorResults)) = params.ErrorResults{
Results: []params.ErrorResult{{}},
}
s.statusSet = true
default:
c.Fatalf("unexpected api call %q", request)
return nil
}
return nil
}
}

func (s *applicationSuite) TestNameTagAndString(c *gc.C) {
client := uniter.NewState(s.apiCaller, names.NewUnitTag("mysql/0"))
client := uniter.NewState(s.apiCallerFunc(c), names.NewUnitTag("mysql/0"))
tag := names.NewApplicationTag("mysql")
app, err := client.Application(tag)
c.Assert(err, jc.ErrorIsNil)
Expand All @@ -113,7 +123,7 @@ func (s *applicationSuite) TestNameTagAndString(c *gc.C) {
}

func (s *applicationSuite) TestWatch(c *gc.C) {
client := uniter.NewState(s.apiCaller, names.NewUnitTag("mysql/0"))
client := uniter.NewState(s.apiCallerFunc(c), names.NewUnitTag("mysql/0"))
app, err := client.Application(names.NewApplicationTag("mysql"))
c.Assert(err, jc.ErrorIsNil)

Expand All @@ -123,11 +133,16 @@ func (s *applicationSuite) TestWatch(c *gc.C) {
defer wc.AssertStops()

// Initial event.
wc.AssertOneChange()
select {
case _, ok := <-w.Changes():
c.Assert(ok, jc.IsTrue)
case <-time.After(testing.LongWait):
c.Fatalf("watcher did not send change")
}
}

func (s *applicationSuite) TestRefresh(c *gc.C) {
client := uniter.NewState(s.apiCaller, names.NewUnitTag("mysql/0"))
client := uniter.NewState(s.apiCallerFunc(c), names.NewUnitTag("mysql/0"))
app, err := client.Application(names.NewApplicationTag("mysql"))
c.Assert(err, jc.ErrorIsNil)

Expand All @@ -138,7 +153,7 @@ func (s *applicationSuite) TestRefresh(c *gc.C) {
}

func (s *applicationSuite) TestCharmURL(c *gc.C) {
client := uniter.NewState(s.apiCaller, names.NewUnitTag("mysql/0"))
client := uniter.NewState(s.apiCallerFunc(c), names.NewUnitTag("mysql/0"))
app, err := client.Application(names.NewApplicationTag("mysql"))
c.Assert(err, jc.ErrorIsNil)

Expand All @@ -149,7 +164,7 @@ func (s *applicationSuite) TestCharmURL(c *gc.C) {
}

func (s *applicationSuite) TestCharmModifiedVersion(c *gc.C) {
client := uniter.NewState(s.apiCaller, names.NewUnitTag("mysql/0"))
client := uniter.NewState(s.apiCallerFunc(c), names.NewUnitTag("mysql/0"))
app, err := client.Application(names.NewApplicationTag("mysql"))
c.Assert(err, jc.ErrorIsNil)

Expand All @@ -159,7 +174,7 @@ func (s *applicationSuite) TestCharmModifiedVersion(c *gc.C) {
}

func (s *applicationSuite) TestSetApplicationStatus(c *gc.C) {
client := uniter.NewState(s.apiCaller, names.NewUnitTag("mysql/0"))
client := uniter.NewState(s.apiCallerFunc(c), names.NewUnitTag("mysql/0"))
app, err := client.Application(names.NewApplicationTag("mysql"))
c.Assert(err, jc.ErrorIsNil)

Expand All @@ -169,7 +184,7 @@ func (s *applicationSuite) TestSetApplicationStatus(c *gc.C) {
}

func (s *applicationSuite) TestApplicationStatus(c *gc.C) {
client := uniter.NewState(s.apiCaller, names.NewUnitTag("mysql/0"))
client := uniter.NewState(s.apiCallerFunc(c), names.NewUnitTag("mysql/0"))
app, err := client.Application(names.NewApplicationTag("mysql"))
c.Assert(err, jc.ErrorIsNil)

Expand Down
19 changes: 12 additions & 7 deletions cmd/juju/commands/bootstrap.go
View file
Expand Up @@ -852,14 +852,19 @@ See `[1:] + "`juju kill-controller`" + `.`)
// eg JUJU_AGENT_TESTING_OPTIONS=foo=bar,timeout=2s
// These are written to the agent.conf VALUES section.
testingOptionsStr := os.Getenv("JUJU_AGENT_TESTING_OPTIONS")
opts, err := keyvalues.Parse(
strings.Split(
strings.ReplaceAll(testingOptionsStr, " ", ""), ","), false)
for k, v := range opts {
if bootstrapParams.ExtraAgentValuesForTesting == nil {
bootstrapParams.ExtraAgentValuesForTesting = map[string]string{}
if len(testingOptionsStr) > 0 {
opts, err := keyvalues.Parse(
strings.Split(
strings.ReplaceAll(testingOptionsStr, " ", ""), ","), false)
if err != nil {
return errors.Annotatef(err, "invalid JUJU_AGENT_TESTING_OPTIONS env value %q", testingOptionsStr)
}
for k, v := range opts {
if bootstrapParams.ExtraAgentValuesForTesting == nil {
bootstrapParams.ExtraAgentValuesForTesting = map[string]string{}
}
bootstrapParams.ExtraAgentValuesForTesting[k] = v
}
bootstrapParams.ExtraAgentValuesForTesting[k] = v
}

bootstrapFuncs := getBootstrapFuncs()
Expand Down

0 comments on commit 025aa88

Please sign in to comment.