Skip to content

Commit

Permalink
Add "internal/charm" imports to allow list of core
Browse files Browse the repository at this point in the history
Many tests began failing when we pulled "juju/charm" into "internal",
now that it exists in juju/juju

Fix tests
  • Loading branch information
jack-w-shaw committed May 21, 2024
1 parent 8a40d41 commit 3545649
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 1 deletion.
4 changes: 4 additions & 0 deletions api/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ func (*ImportSuite) TestImports(c *gc.C) {
"domain/secret/errors",
"domain/secretbackend/errors",
"environs/envcontext",
"internal/charm",
"internal/charm/assumes",
"internal/charm/hooks",
"internal/charm/resource",
"internal/feature",
"internal/logger",
"internal/proxy",
Expand Down
4 changes: 4 additions & 0 deletions cmd/containeragent/initialize/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ func (*importSuite) TestImports(c *gc.C) {
"environs/config",
"environs/envcontext",
"environs/tags",
"internal/charm",
"internal/charm/assumes",
"internal/charm/hooks",
"internal/charm/resource",
"internal/charmhub",
"internal/charmhub/path",
"internal/charmhub/transport",
Expand Down
4 changes: 4 additions & 0 deletions core/base/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ func (*ImportTest) TestImports(c *gc.C) {
c.Assert(found, jc.SameContents, []string{
"core/logger",
"core/os/ostype",
"internal/charm",
"internal/charm/assumes",
"internal/charm/hooks",
"internal/charm/resource",
"internal/logger",
})
}
1 change: 1 addition & 0 deletions core/migration/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ func (*ImportTest) TestImports(c *gc.C) {
"core/logger",
"core/network",
"core/resources",
"internal/charm/resource",
"internal/logger",
})
}
9 changes: 8 additions & 1 deletion core/settings/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,12 @@ func (*importSuite) TestImports(c *gc.C) {
found := coretesting.FindJujuCoreImports(c, "github.com/juju/juju/core/settings")

// This package only brings in other core packages.
c.Assert(found, jc.SameContents, []string{})
c.Assert(found, jc.SameContents, []string{
"core/logger",
"internal/charm",
"internal/charm/assumes",
"internal/charm/hooks",
"internal/charm/resource",
"internal/logger",
})
}
1 change: 1 addition & 0 deletions core/watcher/eventsource/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ func (*ImportTest) TestImports(c *gc.C) {
"core/secrets",
"core/status",
"core/watcher",
"internal/charm/resource",
"internal/logger",
})

Expand Down
1 change: 1 addition & 0 deletions core/watcher/package_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ func (s *ImportTest) TestImports(c *gc.C) {
"core/resources",
"core/secrets",
"core/status",
"internal/charm/resource",
"internal/logger",
})

Expand Down

0 comments on commit 3545649

Please sign in to comment.