juju-core

Merge lp:~niemeyer/juju-core/simplify-sample-charms into lp:~juju/juju-core/trunk

  1. simplify-sample-charms
  2. Merge into trunk
Proposed by Gustavo Niemeyer
Status: Merged
Merged at revision: 711
Proposed branch: lp:~niemeyer/juju-core/simplify-sample-charms
Merge into: lp:~juju/juju-core/trunk
Diff against target: 246 lines (+39/-55)
12 files modified
charm/meta_test.go (+2/-7)
charm/repo_test.go (+4/-4)
juju/testing/conn.go (+1/-1)
testing/repo/series/dummy-v2/config.yaml (+0/-5)
testing/repo/series/dummy-v2/hooks/install (+0/-2)
testing/repo/series/dummy-v2/revision (+0/-1)
testing/repo/series/dummy-v2/src/hello.c (+0/-7)
testing/repo/series/format2/metadata.yaml (+4/-4)
testing/repo/series/upgrade1/metadata.yaml (+4/-4)
testing/repo/series/upgrade2/metadata.yaml (+4/-4)
testing/repo/series/wordpress/metadata.yaml (+0/-2)
worker/uniter/filter_test.go (+20/-14)
To merge this branch: bzr merge lp:~niemeyer/juju-core/simplify-sample-charms
Reviewer Review Type Date Requested Status
The Go Language Gophers Pending
Review via email: mp+132160@code.launchpad.net

Description of the change

testing: improve a bit sample charm situation

Make dummy-v2 trivial and rename it to format.

Rename old/new from sample to upgrade, and name their
directories properly.

https://codereview.appspot.com/6823050/

To post a comment you must log in.
Revision history for this message
Gustavo Niemeyer (niemeyer) wrote :
Download full text (9.8 KiB)

Reviewers: mp+132160_code.launchpad.net,

Message:
Please take a look.

Description:
testing: improve a bit sample charm situation

Make dummy-v2 trivial and rename it to format.

Rename old/new from sample to upgrade, and name their
directories properly.

https://code.launchpad.net/~niemeyer/juju-core/simplify-sample-charms/+merge/132160

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/6823050/

Affected files:
   A [revision details]
   M charm/meta_test.go
   M charm/repo_test.go
   M juju/testing/conn.go
   D testing/repo/series/dummy-v2/build/ignored
   D testing/repo/series/dummy-v2/config.yaml
   D testing/repo/series/dummy-v2/hooks/install
   D testing/repo/series/dummy-v2/revision
   D testing/repo/series/dummy-v2/src/hello.c
   M testing/repo/series/format2/metadata.yaml
   M testing/repo/series/upgrade1/metadata.yaml
   M testing/repo/series/upgrade2/metadata.yaml
   M testing/repo/series/wordpress/metadata.yaml
   M worker/uniter/filter_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: charm/meta_test.go
=== modified file 'charm/meta_test.go'
--- charm/meta_test.go 2012-10-18 06:08:54 +0000
+++ charm/meta_test.go 2012-10-30 16:14:26 +0000
@@ -43,15 +43,10 @@
  }

  func (s *MetaSuite) TestReadMetaVersion2(c *C) {
- meta, err := charm.ReadMeta(repoMeta("dummy-v2"))
+ meta, err := charm.ReadMeta(repoMeta("format2"))
   c.Assert(err, IsNil)
- c.Assert(meta.Name, Equals, "dummy-v2")
- c.Assert(meta.Summary, Equals, "That's a new dummy charm.")
- c.Assert(meta.Description, Equals,
- "This is a longer description which\npotentially contains multiple
lines.\n")
+ c.Assert(meta.Name, Equals, "format2")
   c.Assert(meta.Format, Equals, 2)
- c.Assert(meta.OldRevision, Equals, 0)
- c.Assert(meta.Subordinate, Equals, false)
  }

  func (s *MetaSuite) TestSubordinate(c *C) {

Index: charm/repo_test.go
=== modified file 'charm/repo_test.go'
--- charm/repo_test.go 2012-09-12 22:31:00 +0000
+++ charm/repo_test.go 2012-10-30 16:14:26 +0000
@@ -251,8 +251,8 @@
  }

  func (s *LocalRepoSuite) TestMultipleVersions(c *C) {
- curl := charm.MustParseURL("local:series/sample")
- s.addDir("old")
+ curl := charm.MustParseURL("local:series/upgrade")
+ s.addDir("upgrade1")
   rev, err := s.repo.Latest(curl)
   c.Assert(err, IsNil)
   c.Assert(rev, Equals, 1)
@@ -260,7 +260,7 @@
   c.Assert(err, IsNil)
   c.Assert(ch.Revision(), Equals, 1)

- s.addDir("new")
+ s.addDir("upgrade2")
   rev, err = s.repo.Latest(curl)
   c.Assert(err, IsNil)
   c.Assert(rev, Equals, 2)
@@ -281,7 +281,7 @@
   c.Assert(err, IsNil)
   c.Assert(rev, Equals, 2)
   ch, err = s.repo.Get(badRevCurl)
- c.Assert(err, ErrorMatches, `no charms found
matching "local:series/sample-33"`)
+ c.Assert(err, ErrorMatches, `no charms found
matching "local:series/upgrade-33"`)
  }

  func (s *LocalRepoSuite) TestBundle(c *C) {

Index: juju/testing/conn.go
==...

Revision history for this message
William Reade (fwereade) wrote :

On 2012/10/30 16:15:46, niemeyer wrote:
> Please take a look.

LGTM

https://codereview.appspot.com/6823050/

Revision history for this message
Gustavo Niemeyer (niemeyer) wrote :

*** Submitted:

testing: improve a bit sample charm situation

Make dummy-v2 trivial and rename it to format.

Rename old/new from sample to upgrade, and name their
directories properly.

R=fwereade
CC=
https://codereview.appspot.com/6823050

https://codereview.appspot.com/6823050/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'charm/meta_test.go'
--- charm/meta_test.go 2012-10-18 06:08:54 +0000
+++ charm/meta_test.go 2012-10-30 16:16:36 +0000
@@ -43,15 +43,10 @@
43}43}
4444
45func (s *MetaSuite) TestReadMetaVersion2(c *C) {45func (s *MetaSuite) TestReadMetaVersion2(c *C) {
46 meta, err := charm.ReadMeta(repoMeta("dummy-v2"))46 meta, err := charm.ReadMeta(repoMeta("format2"))
47 c.Assert(err, IsNil)47 c.Assert(err, IsNil)
48 c.Assert(meta.Name, Equals, "dummy-v2")48 c.Assert(meta.Name, Equals, "format2")
49 c.Assert(meta.Summary, Equals, "That's a new dummy charm.")
50 c.Assert(meta.Description, Equals,
51 "This is a longer description which\npotentially contains multiple lines.\n")
52 c.Assert(meta.Format, Equals, 2)49 c.Assert(meta.Format, Equals, 2)
53 c.Assert(meta.OldRevision, Equals, 0)
54 c.Assert(meta.Subordinate, Equals, false)
55}50}
5651
57func (s *MetaSuite) TestSubordinate(c *C) {52func (s *MetaSuite) TestSubordinate(c *C) {
5853
=== modified file 'charm/repo_test.go'
--- charm/repo_test.go 2012-09-12 22:31:00 +0000
+++ charm/repo_test.go 2012-10-30 16:16:36 +0000
@@ -251,8 +251,8 @@
251}251}
252252
253func (s *LocalRepoSuite) TestMultipleVersions(c *C) {253func (s *LocalRepoSuite) TestMultipleVersions(c *C) {
254 curl := charm.MustParseURL("local:series/sample")254 curl := charm.MustParseURL("local:series/upgrade")
255 s.addDir("old")255 s.addDir("upgrade1")
256 rev, err := s.repo.Latest(curl)256 rev, err := s.repo.Latest(curl)
257 c.Assert(err, IsNil)257 c.Assert(err, IsNil)
258 c.Assert(rev, Equals, 1)258 c.Assert(rev, Equals, 1)
@@ -260,7 +260,7 @@
260 c.Assert(err, IsNil)260 c.Assert(err, IsNil)
261 c.Assert(ch.Revision(), Equals, 1)261 c.Assert(ch.Revision(), Equals, 1)
262262
263 s.addDir("new")263 s.addDir("upgrade2")
264 rev, err = s.repo.Latest(curl)264 rev, err = s.repo.Latest(curl)
265 c.Assert(err, IsNil)265 c.Assert(err, IsNil)
266 c.Assert(rev, Equals, 2)266 c.Assert(rev, Equals, 2)
@@ -281,7 +281,7 @@
281 c.Assert(err, IsNil)281 c.Assert(err, IsNil)
282 c.Assert(rev, Equals, 2)282 c.Assert(rev, Equals, 2)
283 ch, err = s.repo.Get(badRevCurl)283 ch, err = s.repo.Get(badRevCurl)
284 c.Assert(err, ErrorMatches, `no charms found matching "local:series/sample-33"`)284 c.Assert(err, ErrorMatches, `no charms found matching "local:series/upgrade-33"`)
285}285}
286286
287func (s *LocalRepoSuite) TestBundle(c *C) {287func (s *LocalRepoSuite) TestBundle(c *C) {
288288
=== modified file 'juju/testing/conn.go'
--- juju/testing/conn.go 2012-10-16 17:27:05 +0000
+++ juju/testing/conn.go 2012-10-30 16:16:36 +0000
@@ -169,7 +169,7 @@
169169
170func (s *JujuConnSuite) AddTestingCharm(c *C, name string) *state.Charm {170func (s *JujuConnSuite) AddTestingCharm(c *C, name string) *state.Charm {
171 ch := testing.Charms.Dir("series", name)171 ch := testing.Charms.Dir("series", name)
172 ident := fmt.Sprintf("%s-%d", name, ch.Revision())172 ident := fmt.Sprintf("%s-%d", ch.Meta().Name, ch.Revision())
173 curl := charm.MustParseURL("local:series/" + ident)173 curl := charm.MustParseURL("local:series/" + ident)
174 repo, err := charm.InferRepository(curl, testing.Charms.Path)174 repo, err := charm.InferRepository(curl, testing.Charms.Path)
175 c.Assert(err, IsNil)175 c.Assert(err, IsNil)
176176
=== removed directory 'testing/repo/series/dummy-v2/build'
=== removed file 'testing/repo/series/dummy-v2/build/ignored'
=== removed file 'testing/repo/series/dummy-v2/config.yaml'
--- testing/repo/series/dummy-v2/config.yaml 2012-09-17 11:07:43 +0000
+++ testing/repo/series/dummy-v2/config.yaml 1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
1options:
2 title: {default: My Title, description: A descriptive title used for the service., type: string}
3 outlook: {description: No default outlook., type: string}
4 username: {default: admin001, description: The name of the initial account (given admin permissions)., type: string}
5 skill-level: {description: A number indicating skill., type: int}
60
=== removed directory 'testing/repo/series/dummy-v2/empty'
=== removed directory 'testing/repo/series/dummy-v2/hooks'
=== removed file 'testing/repo/series/dummy-v2/hooks/install'
--- testing/repo/series/dummy-v2/hooks/install 2012-09-17 11:07:43 +0000
+++ testing/repo/series/dummy-v2/hooks/install 1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
1#!/bin/bash
2echo "Done!"
30
=== removed symlink 'testing/repo/series/dummy-v2/hooks/symlink'
=== target was u'../target'
=== removed file 'testing/repo/series/dummy-v2/revision'
--- testing/repo/series/dummy-v2/revision 2012-09-17 11:07:43 +0000
+++ testing/repo/series/dummy-v2/revision 1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
11
2\ No newline at end of file0\ No newline at end of file
31
=== removed directory 'testing/repo/series/dummy-v2/src'
=== removed file 'testing/repo/series/dummy-v2/src/hello.c'
--- testing/repo/series/dummy-v2/src/hello.c 2012-09-17 11:07:43 +0000
+++ testing/repo/series/dummy-v2/src/hello.c 1970-01-01 00:00:00 +0000
@@ -1,7 +0,0 @@
1#include <stdio.h>
2
3main()
4{
5 printf ("Hello World!\n");
6 return 0;
7}
80
=== renamed directory 'testing/repo/series/dummy-v2' => 'testing/repo/series/format2'
=== modified file 'testing/repo/series/format2/metadata.yaml'
--- testing/repo/series/dummy-v2/metadata.yaml 2012-09-17 11:07:43 +0000
+++ testing/repo/series/format2/metadata.yaml 2012-10-30 16:16:36 +0000
@@ -1,6 +1,6 @@
1name: dummy-v21name: format2
2format: 22format: 2
3summary: "That's a new dummy charm."3summary: "Sample charm described in format 2"
4description: |4description: |
5 This is a longer description which5 That's a boring charm that is described in
6 potentially contains multiple lines.6 terms of format 2.
77
=== renamed directory 'testing/repo/series/old' => 'testing/repo/series/upgrade1'
=== modified file 'testing/repo/series/upgrade1/metadata.yaml'
--- testing/repo/series/old/metadata.yaml 2011-10-08 18:54:17 +0000
+++ testing/repo/series/upgrade1/metadata.yaml 2012-10-30 16:16:36 +0000
@@ -1,5 +1,5 @@
1name: sample1name: upgrade
2summary: "That's a sample charm."2summary: "Sample charm to test version changes"
3description: |3description: |
4 This is a longer description which4 Sample charm to test version changes.
5 potentially contains multiple lines.5 This is the old charm.
66
=== renamed directory 'testing/repo/series/new' => 'testing/repo/series/upgrade2'
=== modified file 'testing/repo/series/upgrade2/metadata.yaml'
--- testing/repo/series/new/metadata.yaml 2011-10-08 18:54:17 +0000
+++ testing/repo/series/upgrade2/metadata.yaml 2012-10-30 16:16:36 +0000
@@ -1,5 +1,5 @@
1name: sample1name: upgrade
2summary: "That's a sample charm."2summary: "Sample charm to test version changes"
3description: |3description: |
4 This is a longer description which4 Sample charm to test version changes.
5 potentially contains multiple lines.5 This is the new charm.
66
=== modified file 'testing/repo/series/wordpress/metadata.yaml'
--- testing/repo/series/wordpress/metadata.yaml 2012-10-22 16:37:11 +0000
+++ testing/repo/series/wordpress/metadata.yaml 2012-10-30 16:16:36 +0000
@@ -18,5 +18,3 @@
18 interface: varnish18 interface: varnish
19 limit: 219 limit: 2
20 optional: true20 optional: true
21
22
2321
=== modified file 'worker/uniter/filter_test.go'
--- worker/uniter/filter_test.go 2012-10-30 10:48:42 +0000
+++ worker/uniter/filter_test.go 2012-10-30 16:16:36 +0000
@@ -165,7 +165,13 @@
165}165}
166166
167func (s *FilterSuite) TestCharmEvents(c *C) {167func (s *FilterSuite) TestCharmEvents(c *C) {
168 f, err := newFilter(s.State, s.unit.Name())168 oldCharm := s.AddTestingCharm(c, "upgrade1")
169 svc, err := s.State.AddService("upgradetest", oldCharm)
170 c.Assert(err, IsNil)
171 unit, err := svc.AddUnit()
172 c.Assert(err, IsNil)
173
174 f, err := newFilter(s.State, unit.Name())
169 c.Assert(err, IsNil)175 c.Assert(err, IsNil)
170 defer f.Stop()176 defer f.Stop()
171177
@@ -181,48 +187,48 @@
181 assertNoChange()187 assertNoChange()
182188
183 // Request an event relative to the existing state; nothing.189 // Request an event relative to the existing state; nothing.
184 f.WantUpgradeEvent(s.ch.URL(), false)190 f.WantUpgradeEvent(oldCharm.URL(), false)
185 assertNoChange()191 assertNoChange()
186192
187 // Change the service in an irrelevant way; no events.193 // Change the service in an irrelevant way; no events.
188 err = s.svc.SetExposed()194 err = svc.SetExposed()
189 c.Assert(err, IsNil)195 c.Assert(err, IsNil)
190 assertNoChange()196 assertNoChange()
191197
192 // Change the service's charm; new event received.198 // Change the service's charm; new event received.
193 ch := s.AddTestingCharm(c, "dummy-v2")199 newCharm := s.AddTestingCharm(c, "upgrade2")
194 err = s.svc.SetCharm(ch, false)200 err = svc.SetCharm(newCharm, false)
195 c.Assert(err, IsNil)201 c.Assert(err, IsNil)
196 assertChange := func(url *charm.URL) {202 assertChange := func(url *charm.URL) {
197 s.State.Sync()203 s.State.Sync()
198 select {204 select {
199 case sch := <-f.UpgradeEvents():205 case upgradeCharm := <-f.UpgradeEvents():
200 c.Assert(sch.URL(), DeepEquals, url)206 c.Assert(upgradeCharm.URL(), DeepEquals, url)
201 case <-time.After(50 * time.Millisecond):207 case <-time.After(50 * time.Millisecond):
202 c.Fatalf("timed out")208 c.Fatalf("timed out")
203 }209 }
204 }210 }
205 assertChange(ch.URL())211 assertChange(newCharm.URL())
206 assertNoChange()212 assertNoChange()
207213
208 // Request a change relative to the original state, unforced;214 // Request a change relative to the original state, unforced;
209 // same event is sent.215 // same event is sent.
210 f.WantUpgradeEvent(s.ch.URL(), false)216 f.WantUpgradeEvent(oldCharm.URL(), false)
211 assertChange(ch.URL())217 assertChange(newCharm.URL())
212 assertNoChange()218 assertNoChange()
213219
214 // Request a forced change relative to the initial state; no change...220 // Request a forced change relative to the initial state; no change...
215 f.WantUpgradeEvent(s.ch.URL(), true)221 f.WantUpgradeEvent(oldCharm.URL(), true)
216 assertNoChange()222 assertNoChange()
217223
218 // ...and still no change when we have a forced upgrade to that state...224 // ...and still no change when we have a forced upgrade to that state...
219 err = s.svc.SetCharm(s.ch, true)225 err = svc.SetCharm(oldCharm, true)
220 c.Assert(err, IsNil)226 c.Assert(err, IsNil)
221 assertNoChange()227 assertNoChange()
222228
223 // ...but a *forced* change to a different charm does generate an event.229 // ...but a *forced* change to a different charm does generate an event.
224 err = s.svc.SetCharm(ch, true)230 err = svc.SetCharm(newCharm, true)
225 assertChange(ch.URL())231 assertChange(newCharm.URL())
226 assertNoChange()232 assertNoChange()
227}233}
228234

Subscribers

People subscribed via source and target branches