Skip to content

Commit

Permalink
Remove now-unnecessary calls to RegisterForServer
Browse files Browse the repository at this point in the history
The resources and payload facades are now always registered and don't
require the component mechanism to do this.
  • Loading branch information
Menno Smits committed Mar 20, 2017
1 parent f8cc1b2 commit 41fc8e0
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
3 changes: 0 additions & 3 deletions api/facadeversions_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (

"github.com/juju/juju/api"
"github.com/juju/juju/apiserver/common"
"github.com/juju/juju/component/all"
"github.com/juju/juju/feature"
coretesting "github.com/juju/juju/testing"
)
Expand All @@ -36,8 +35,6 @@ func (s *facadeVersionSuite) TestFacadeVersionsMatchServerVersions(c *gc.C) {
// All versions should now be non-zero.
c.Check(version, jc.GreaterThan, 0)
}
// Register the components.
all.RegisterForServer()
allServerFacades := common.Facades.List()
serverFacadeNames := set.NewStrings()
serverFacadeBestVersions := make(map[string]int, len(allServerFacades))
Expand Down
7 changes: 0 additions & 7 deletions payload/context/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,8 @@ import (
"testing"

gc "gopkg.in/check.v1"

components "github.com/juju/juju/component/all"
)

func Test(t *testing.T) {
err := components.RegisterForServer()
if err != nil {
t.Fatalf("could not register server components: %v", err)
}

gc.TestingT(t)
}

0 comments on commit 41fc8e0

Please sign in to comment.