Fix DeploySuite.TestDeployBundleWithOffers;

cmd/juju/application/deploy_test.go

@@ -945,7 +945,7 @@ func (s *DeploySuite) TestDeployBundleWithOffers(c *gc.C) {
 	s.fakeAPI.Call("ListSpaces").Returns([]params.Space{{Name: "alpha", Id: "0"}}, error(nil))
 
 	deploy := s.deployCommand()
-	bundlePath := testcharms.RepoWithSeries("bionic").ClonedBundleDirPath(c.MkDir(), "apache2-with-offers")
+	bundlePath := testcharms.RepoWithSeries("bionic").ClonedBundleDirPath(c.MkDir(), "apache2-with-offers-legacy")
 	_, err := cmdtesting.RunCommand(c, modelcmd.Wrap(deploy), bundlePath)
 	c.Assert(err, jc.ErrorIsNil)
 
@@ -2132,14 +2132,6 @@ func (s *FakeStoreStateSuite) setupBundle(c *gc.C, url, name string, series ...s
 	}
 }
 
-func (s *FakeStoreStateSuite) combinedSettings(ch charm.Charm, inSettings charm.Settings) charm.Settings {
-	result := ch.Config().DefaultSettings()
-	for name, value := range inSettings {
-		result[name] = value
-	}
-	return result
-}
-
 // assertCharmsUploaded checks that the given charm ids have been uploaded.
 func (s *FakeStoreStateSuite) assertCharmsUploaded(c *gc.C, ids ...string) {
 	allCharms, err := s.State.AllCharms()

testcharms/charm-repo/bundle/apache2-with-offers-legacy/README.md

@@ -0,0 +1 @@
+A bundle installing apache2 and exposing two offers for its endpoints

testcharms/charm-repo/bundle/apache2-with-offers-legacy/bundle.yaml

@@ -0,0 +1,19 @@
+series: bionic
+applications:
+  apache2:
+    charm: cs:apache2-26
+---
+series: bionic
+applications:
+  apache2:
+    offers:
+      my-offer:
+        endpoints:
+        - apache-website
+        - website-cache
+        acl:
+          admin: admin
+          bar: consume
+      my-other-offer:
+        endpoints:
+        - apache-website