/juju

Update charmstore and charmrepo dependencies. #5978

Merged
merged 1 commit into from Aug 11, 2016
Commits
Jump to file or symbol
Failed to load files and symbols.
+27 −20
Split
View
22 charmstore/client_test.go
@@ -64,10 +64,10 @@ func (s *ClientSuite) TestLatestRevisions(c *gc.C) {
Channel: params.StableChannel,
}, {
URL: bar,
- Channel: params.DevelopmentChannel,
+ Channel: params.EdgeChannel,
}, {
URL: baz,
- Channel: params.DevelopmentChannel,
+ Channel: params.EdgeChannel,
}}, nil)
c.Assert(err, jc.ErrorIsNil)
expected := []CharmRevision{{
@@ -79,8 +79,8 @@ func (s *ClientSuite) TestLatestRevisions(c *gc.C) {
}}
c.Check(ret, jc.SameContents, expected)
s.wrapper.stableStub.CheckCall(c, 0, "Latest", params.StableChannel, []*charm.URL{foo}, map[string][]string(nil))
- s.wrapper.devStub.CheckCall(c, 0, "Latest", params.DevelopmentChannel, []*charm.URL{bar}, map[string][]string(nil))
- s.wrapper.devStub.CheckCall(c, 1, "Latest", params.DevelopmentChannel, []*charm.URL{baz}, map[string][]string(nil))
+ s.wrapper.devStub.CheckCall(c, 0, "Latest", params.EdgeChannel, []*charm.URL{bar}, map[string][]string(nil))
+ s.wrapper.devStub.CheckCall(c, 1, "Latest", params.EdgeChannel, []*charm.URL{baz}, map[string][]string(nil))
}
func (s *ClientSuite) TestListResources(c *gc.C) {
@@ -130,10 +130,10 @@ func (s *ClientSuite) TestListResources(c *gc.C) {
Channel: params.StableChannel,
}, {
URL: bar,
- Channel: params.DevelopmentChannel,
+ Channel: params.EdgeChannel,
}, {
URL: baz,
- Channel: params.DevelopmentChannel,
+ Channel: params.EdgeChannel,
}})
c.Assert(err, jc.ErrorIsNil)
@@ -152,8 +152,8 @@ func (s *ClientSuite) TestListResources(c *gc.C) {
{dev2Out},
})
s.wrapper.stableStub.CheckCall(c, 0, "ListResources", params.StableChannel, foo)
- s.wrapper.devStub.CheckCall(c, 0, "ListResources", params.DevelopmentChannel, bar)
- s.wrapper.devStub.CheckCall(c, 1, "ListResources", params.DevelopmentChannel, baz)
+ s.wrapper.devStub.CheckCall(c, 0, "ListResources", params.EdgeChannel, bar)
+ s.wrapper.devStub.CheckCall(c, 1, "ListResources", params.EdgeChannel, baz)
}
func (s *ClientSuite) TestListResourcesError(c *gc.C) {
@@ -194,7 +194,7 @@ func (s *ClientSuite) TestGetResource(c *gc.C) {
req := ResourceRequest{
Charm: charm.MustParseURL("cs:mysql"),
- Channel: params.DevelopmentChannel,
+ Channel: params.EdgeChannel,
Name: "name",
Revision: 5,
}
@@ -205,8 +205,8 @@ func (s *ClientSuite) TestGetResource(c *gc.C) {
c.Check(data.Resource, gc.DeepEquals, expected)
c.Check(data.ReadCloser, gc.DeepEquals, rc)
// call #0 is a call to makeWrapper
- s.wrapper.stub.CheckCall(c, 1, "ResourceMeta", params.DevelopmentChannel, req.Charm, req.Name, req.Revision)
- s.wrapper.stub.CheckCall(c, 2, "GetResource", params.DevelopmentChannel, req.Charm, req.Name, req.Revision)
+ s.wrapper.stub.CheckCall(c, 1, "ResourceMeta", params.EdgeChannel, req.Charm, req.Name, req.Revision)
+ s.wrapper.stub.CheckCall(c, 2, "GetResource", params.EdgeChannel, req.Charm, req.Name, req.Revision)
}
func (s *ClientSuite) TestResourceInfo(c *gc.C) {
View
4 cmd/juju/application/deploy_test.go
@@ -652,10 +652,10 @@ func (s *DeployCharmStoreSuite) TestDeployWithChannel(c *gc.C) {
err := s.client.UploadCharmWithRevision(id, ch, -1)
c.Assert(err, gc.IsNil)
- err = s.client.Publish(id, []csclientparams.Channel{csclientparams.DevelopmentChannel}, nil)
+ err = s.client.Publish(id, []csclientparams.Channel{csclientparams.EdgeChannel}, nil)
c.Assert(err, gc.IsNil)
- _, err = runDeployCommand(c, "--channel", "development", "~client-username/wordpress")
+ _, err = runDeployCommand(c, "--channel", "edge", "~client-username/wordpress")
c.Assert(err, gc.IsNil)
s.assertCharmsUploaded(c, "cs:~client-username/precise/wordpress-0")
s.assertApplicationsDeployed(c, map[string]serviceInfo{
View
6 cmd/juju/application/upgradecharm_test.go
@@ -411,16 +411,16 @@ func (s *UpgradeCharmCharmStoreSuite) TestUpgradeCharmWithChannel(c *gc.C) {
c.Assert(err, jc.ErrorIsNil)
// Upload a new revision of the charm, but publish it
- // only to the development channel.
+ // only to the beta channel.
id.Revision = 1
err = s.client.UploadCharmWithRevision(id, ch, -1)
c.Assert(err, gc.IsNil)
- err = s.client.Publish(id, []csclientparams.Channel{csclientparams.DevelopmentChannel}, nil)
+ err = s.client.Publish(id, []csclientparams.Channel{csclientparams.BetaChannel}, nil)
c.Assert(err, gc.IsNil)
- err = runUpgradeCharm(c, "wordpress", "--channel", "development")
+ err = runUpgradeCharm(c, "wordpress", "--channel", "beta")
c.Assert(err, gc.IsNil)
s.assertCharmsUploaded(c, "cs:~client-username/trusty/wordpress-0", "cs:~client-username/trusty/wordpress-1")
View
15 dependencies.tsv
@@ -2,12 +2,14 @@ github.com/Azure/azure-sdk-for-go git 902d95d9f311ae585ee98cfd18f418b467d60d5a 2
github.com/Azure/go-autorest git 6f40a8acfe03270d792cb8155e2942c09d7cff95 2016-07-19T23:14:56Z
github.com/ajstarks/svgo git 89e3ac64b5b3e403a5e7c35ea4f98d45db7b4518 2014-10-04T21:11:59Z
github.com/altoros/gosigma git 31228935eec685587914528585da4eb9b073c76d 2015-04-08T14:52:32Z
+github.com/beorn7/perks git 3ac7bf7a47d159a033b107610db8a1b6575507a4 2016-02-29T21:34:45Z
github.com/bmizerany/pat git c068ca2f0aacee5ac3681d68e4d0a003b7d1fd2c 2016-02-17T10:32:42Z
github.com/coreos/go-systemd git 7b2428fec40033549c68f54e26e89e7ca9a9ce31 2016-02-02T21:14:25Z
github.com/dgrijalva/jwt-go git 01aeca54ebda6e0fbfafd0a524d234159c05ec20 2016-07-05T20:30:06Z
github.com/dustin/go-humanize git 145fabdb1ab757076a70a886d092a3af27f66f4c 2014-12-28T07:11:48Z
github.com/gabriel-samfira/sys git 9ddc60d56b511544223adecea68da1e4f2153beb 2015-06-08T13:21:19Z
github.com/godbus/dbus git 32c6cc29c14570de4cf6d7e7737d68fb2d01ad15 2016-05-06T22:25:50Z
+github.com/golang/protobuf git 34a5f244f1c01cdfee8e60324258cfbb97a42aec 2015-05-26T01:21:09Z
github.com/google/go-querystring git 9235644dd9e52eeae6fa48efd539fdc351a0af53 2016-04-01T23:30:42Z
github.com/gorilla/schema git 08023a0215e7fc27a9aecd8b8c50913c40019478 2016-04-26T23:15:12Z
github.com/gorilla/websocket git 13e4d0621caa4d77fd9aa470ef6d7ab63d1a5e41 2015-09-23T22:29:30Z
@@ -49,6 +51,11 @@ github.com/juju/zip git f6b1e93fa2e29a1d7d49b566b2b51efb060c982a 2016-02-05T10:5
github.com/julienschmidt/httprouter git 77a895ad01ebc98a4dc95d8355bc825ce80a56f6 2015-10-13T22:55:20Z
github.com/lxc/lxd git 62f62e9d6e0da14947023f99764eac29c26cef8d 2016-03-28T00:14:48Z
github.com/mattn/go-runewidth git d96d1bd051f2bd9e7e43d602782b37b93b1b5666 2015-11-18T07:21:59Z
+github.com/matttproud/golang_protobuf_extensions git c12348ce28de40eed0136aa2b644d0ee0650e56c 2016-04-24T11:30:07Z
+github.com/prometheus/client_golang git b90ee0840e8e7dfb84c08d13b9c4f3a794586a21 2016-05-13T04:20:11Z
+github.com/prometheus/client_model git fa8ad6fec33561be4280a8f0514318c79d7f6cb6 2015-02-12T10:17:44Z
+github.com/prometheus/common git dd586c1c5abb0be59e60f942c22af711a2008cb4 2016-05-03T22:05:32Z
+github.com/prometheus/procfs git abf152e5f3e97f2fafac028d2cc06c1feb87ffa5 2016-04-11T19:08:41Z
github.com/rogpeppe/fastuuid git 6724a57986aff9bff1a1770e9347036def7c89f6 2015-01-06T09:32:20Z
golang.org/x/crypto git aedad9a179ec1ea11b7064c57cbc6dc30d7724ec 2015-08-30T18:06:42Z
golang.org/x/net git ea47fc708ee3e20177f3ca3716217c4ab75942cb 2015-08-29T23:03:18Z
@@ -62,12 +69,12 @@ gopkg.in/goose.v1 git 495e6fa2ab89bc5ed2c8e1bbcbc4c9e4a3c97d37 2016-03-17T17:25:
gopkg.in/ini.v1 git 776aa739ce9373377cd16f526cdf06cb4c89b40f 2016-02-22T23:24:41Z
gopkg.in/juju/blobstore.v2 git 51fa6e26128d74e445c72d3a91af555151cc3654 2016-01-25T02:37:03Z
gopkg.in/juju/charm.v6-unstable git a3bb92d047b0892452b6a39ece59b4d3a2ac35b9 2016-07-22T08:34:31Z
-gopkg.in/juju/charmrepo.v2-unstable git 6e6733987fb03100f30e494cc1134351fe4a593b 2016-05-30T23:07:41Z
-gopkg.in/juju/charmstore.v5-unstable git 2cb9f80553dddaae8c5e2161ea45f4be5d9afc00 2016-05-27T11:46:22Z
+gopkg.in/juju/charmrepo.v2-unstable git 73c1113f7ddee0306f4b3c19773d35a3f153c04a 2016-08-11T14:04:21Z
+gopkg.in/juju/charmstore.v5-unstable git 714c25cd43dbb8eb51f57a55d76d521fc2126455 2016-08-09T13:45:06Z
gopkg.in/juju/environschema.v1 git 7359fc7857abe2b11b5b3e23811a9c64cb6b01e0 2015-11-04T11:58:10Z
-gopkg.in/juju/jujusvg.v1 git cc128825adce31ea13020d24e7b3302bac86a8c3 2016-05-30T22:53:36Z
+gopkg.in/juju/jujusvg.v2 git d82160011935ef79fc7aca84aba2c6f74700fe75 2016-06-09T10:52:15Z
gopkg.in/juju/names.v2 git 3e0d33a444fec55aea7269b849eb22da41e73072 2016-07-18T22:31:20Z
-gopkg.in/macaroon-bakery.v1 git b097c9d99b2537efaf54492e08f7e148f956ba51 2016-05-24T09:38:11Z
+gopkg.in/macaroon-bakery.v1 git 469b44e6f1f9479e115c8ae879ef80695be624d5 2016-06-22T12:14:21Z
gopkg.in/macaroon.v1 git ab3940c6c16510a850e1c2dd628b919f0f3f1464 2015-01-21T11:42:31Z
gopkg.in/mgo.v2 git 29cc868a5ca65f401ff318143f9408d02f4799cc 2016-06-09T18:00:28Z
gopkg.in/natefinch/lumberjack.v2 git 514cbda263a734ae8caac038dadf05f8f3f9f738 2016-01-25T11:17:49Z