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
1=== modified file 'charm/meta_test.go'
2--- charm/meta_test.go 2012-10-18 06:08:54 +0000
3+++ charm/meta_test.go 2012-10-30 16:16:36 +0000
4@@ -43,15 +43,10 @@
5 }
6
7 func (s *MetaSuite) TestReadMetaVersion2(c *C) {
8- meta, err := charm.ReadMeta(repoMeta("dummy-v2"))
9+ meta, err := charm.ReadMeta(repoMeta("format2"))
10 c.Assert(err, IsNil)
11- c.Assert(meta.Name, Equals, "dummy-v2")
12- c.Assert(meta.Summary, Equals, "That's a new dummy charm.")
13- c.Assert(meta.Description, Equals,
14- "This is a longer description which\npotentially contains multiple lines.\n")
15+ c.Assert(meta.Name, Equals, "format2")
16 c.Assert(meta.Format, Equals, 2)
17- c.Assert(meta.OldRevision, Equals, 0)
18- c.Assert(meta.Subordinate, Equals, false)
19 }
20
21 func (s *MetaSuite) TestSubordinate(c *C) {
22
23=== modified file 'charm/repo_test.go'
24--- charm/repo_test.go 2012-09-12 22:31:00 +0000
25+++ charm/repo_test.go 2012-10-30 16:16:36 +0000
26@@ -251,8 +251,8 @@
27 }
28
29 func (s *LocalRepoSuite) TestMultipleVersions(c *C) {
30- curl := charm.MustParseURL("local:series/sample")
31- s.addDir("old")
32+ curl := charm.MustParseURL("local:series/upgrade")
33+ s.addDir("upgrade1")
34 rev, err := s.repo.Latest(curl)
35 c.Assert(err, IsNil)
36 c.Assert(rev, Equals, 1)
37@@ -260,7 +260,7 @@
38 c.Assert(err, IsNil)
39 c.Assert(ch.Revision(), Equals, 1)
40
41- s.addDir("new")
42+ s.addDir("upgrade2")
43 rev, err = s.repo.Latest(curl)
44 c.Assert(err, IsNil)
45 c.Assert(rev, Equals, 2)
46@@ -281,7 +281,7 @@
47 c.Assert(err, IsNil)
48 c.Assert(rev, Equals, 2)
49 ch, err = s.repo.Get(badRevCurl)
50- c.Assert(err, ErrorMatches, `no charms found matching "local:series/sample-33"`)
51+ c.Assert(err, ErrorMatches, `no charms found matching "local:series/upgrade-33"`)
52 }
53
54 func (s *LocalRepoSuite) TestBundle(c *C) {
55
56=== modified file 'juju/testing/conn.go'
57--- juju/testing/conn.go 2012-10-16 17:27:05 +0000
58+++ juju/testing/conn.go 2012-10-30 16:16:36 +0000
59@@ -169,7 +169,7 @@
60
61 func (s *JujuConnSuite) AddTestingCharm(c *C, name string) *state.Charm {
62 ch := testing.Charms.Dir("series", name)
63- ident := fmt.Sprintf("%s-%d", name, ch.Revision())
64+ ident := fmt.Sprintf("%s-%d", ch.Meta().Name, ch.Revision())
65 curl := charm.MustParseURL("local:series/" + ident)
66 repo, err := charm.InferRepository(curl, testing.Charms.Path)
67 c.Assert(err, IsNil)
68
69=== removed directory 'testing/repo/series/dummy-v2/build'
70=== removed file 'testing/repo/series/dummy-v2/build/ignored'
71=== removed file 'testing/repo/series/dummy-v2/config.yaml'
72--- testing/repo/series/dummy-v2/config.yaml 2012-09-17 11:07:43 +0000
73+++ testing/repo/series/dummy-v2/config.yaml 1970-01-01 00:00:00 +0000
74@@ -1,5 +0,0 @@
75-options:
76- title: {default: My Title, description: A descriptive title used for the service., type: string}
77- outlook: {description: No default outlook., type: string}
78- username: {default: admin001, description: The name of the initial account (given admin permissions)., type: string}
79- skill-level: {description: A number indicating skill., type: int}
80
81=== removed directory 'testing/repo/series/dummy-v2/empty'
82=== removed directory 'testing/repo/series/dummy-v2/hooks'
83=== removed file 'testing/repo/series/dummy-v2/hooks/install'
84--- testing/repo/series/dummy-v2/hooks/install 2012-09-17 11:07:43 +0000
85+++ testing/repo/series/dummy-v2/hooks/install 1970-01-01 00:00:00 +0000
86@@ -1,2 +0,0 @@
87-#!/bin/bash
88-echo "Done!"
89
90=== removed symlink 'testing/repo/series/dummy-v2/hooks/symlink'
91=== target was u'../target'
92=== removed file 'testing/repo/series/dummy-v2/revision'
93--- testing/repo/series/dummy-v2/revision 2012-09-17 11:07:43 +0000
94+++ testing/repo/series/dummy-v2/revision 1970-01-01 00:00:00 +0000
95@@ -1,1 +0,0 @@
96-1
97\ No newline at end of file
98
99=== removed directory 'testing/repo/series/dummy-v2/src'
100=== removed file 'testing/repo/series/dummy-v2/src/hello.c'
101--- testing/repo/series/dummy-v2/src/hello.c 2012-09-17 11:07:43 +0000
102+++ testing/repo/series/dummy-v2/src/hello.c 1970-01-01 00:00:00 +0000
103@@ -1,7 +0,0 @@
104-#include <stdio.h>
105-
106-main()
107-{
108- printf ("Hello World!\n");
109- return 0;
110-}
111
112=== renamed directory 'testing/repo/series/dummy-v2' => 'testing/repo/series/format2'
113=== modified file 'testing/repo/series/format2/metadata.yaml'
114--- testing/repo/series/dummy-v2/metadata.yaml 2012-09-17 11:07:43 +0000
115+++ testing/repo/series/format2/metadata.yaml 2012-10-30 16:16:36 +0000
116@@ -1,6 +1,6 @@
117-name: dummy-v2
118+name: format2
119 format: 2
120-summary: "That's a new dummy charm."
121+summary: "Sample charm described in format 2"
122 description: |
123- This is a longer description which
124- potentially contains multiple lines.
125+ That's a boring charm that is described in
126+ terms of format 2.
127
128=== renamed directory 'testing/repo/series/old' => 'testing/repo/series/upgrade1'
129=== modified file 'testing/repo/series/upgrade1/metadata.yaml'
130--- testing/repo/series/old/metadata.yaml 2011-10-08 18:54:17 +0000
131+++ testing/repo/series/upgrade1/metadata.yaml 2012-10-30 16:16:36 +0000
132@@ -1,5 +1,5 @@
133-name: sample
134-summary: "That's a sample charm."
135+name: upgrade
136+summary: "Sample charm to test version changes"
137 description: |
138- This is a longer description which
139- potentially contains multiple lines.
140+ Sample charm to test version changes.
141+ This is the old charm.
142
143=== renamed directory 'testing/repo/series/new' => 'testing/repo/series/upgrade2'
144=== modified file 'testing/repo/series/upgrade2/metadata.yaml'
145--- testing/repo/series/new/metadata.yaml 2011-10-08 18:54:17 +0000
146+++ testing/repo/series/upgrade2/metadata.yaml 2012-10-30 16:16:36 +0000
147@@ -1,5 +1,5 @@
148-name: sample
149-summary: "That's a sample charm."
150+name: upgrade
151+summary: "Sample charm to test version changes"
152 description: |
153- This is a longer description which
154- potentially contains multiple lines.
155+ Sample charm to test version changes.
156+ This is the new charm.
157
158=== modified file 'testing/repo/series/wordpress/metadata.yaml'
159--- testing/repo/series/wordpress/metadata.yaml 2012-10-22 16:37:11 +0000
160+++ testing/repo/series/wordpress/metadata.yaml 2012-10-30 16:16:36 +0000
161@@ -18,5 +18,3 @@
162 interface: varnish
163 limit: 2
164 optional: true
165-
166-
167
168=== modified file 'worker/uniter/filter_test.go'
169--- worker/uniter/filter_test.go 2012-10-30 10:48:42 +0000
170+++ worker/uniter/filter_test.go 2012-10-30 16:16:36 +0000
171@@ -165,7 +165,13 @@
172 }
173
174 func (s *FilterSuite) TestCharmEvents(c *C) {
175- f, err := newFilter(s.State, s.unit.Name())
176+ oldCharm := s.AddTestingCharm(c, "upgrade1")
177+ svc, err := s.State.AddService("upgradetest", oldCharm)
178+ c.Assert(err, IsNil)
179+ unit, err := svc.AddUnit()
180+ c.Assert(err, IsNil)
181+
182+ f, err := newFilter(s.State, unit.Name())
183 c.Assert(err, IsNil)
184 defer f.Stop()
185
186@@ -181,48 +187,48 @@
187 assertNoChange()
188
189 // Request an event relative to the existing state; nothing.
190- f.WantUpgradeEvent(s.ch.URL(), false)
191+ f.WantUpgradeEvent(oldCharm.URL(), false)
192 assertNoChange()
193
194 // Change the service in an irrelevant way; no events.
195- err = s.svc.SetExposed()
196+ err = svc.SetExposed()
197 c.Assert(err, IsNil)
198 assertNoChange()
199
200 // Change the service's charm; new event received.
201- ch := s.AddTestingCharm(c, "dummy-v2")
202- err = s.svc.SetCharm(ch, false)
203+ newCharm := s.AddTestingCharm(c, "upgrade2")
204+ err = svc.SetCharm(newCharm, false)
205 c.Assert(err, IsNil)
206 assertChange := func(url *charm.URL) {
207 s.State.Sync()
208 select {
209- case sch := <-f.UpgradeEvents():
210- c.Assert(sch.URL(), DeepEquals, url)
211+ case upgradeCharm := <-f.UpgradeEvents():
212+ c.Assert(upgradeCharm.URL(), DeepEquals, url)
213 case <-time.After(50 * time.Millisecond):
214 c.Fatalf("timed out")
215 }
216 }
217- assertChange(ch.URL())
218+ assertChange(newCharm.URL())
219 assertNoChange()
220
221 // Request a change relative to the original state, unforced;
222 // same event is sent.
223- f.WantUpgradeEvent(s.ch.URL(), false)
224- assertChange(ch.URL())
225+ f.WantUpgradeEvent(oldCharm.URL(), false)
226+ assertChange(newCharm.URL())
227 assertNoChange()
228
229 // Request a forced change relative to the initial state; no change...
230- f.WantUpgradeEvent(s.ch.URL(), true)
231+ f.WantUpgradeEvent(oldCharm.URL(), true)
232 assertNoChange()
233
234 // ...and still no change when we have a forced upgrade to that state...
235- err = s.svc.SetCharm(s.ch, true)
236+ err = svc.SetCharm(oldCharm, true)
237 c.Assert(err, IsNil)
238 assertNoChange()
239
240 // ...but a *forced* change to a different charm does generate an event.
241- err = s.svc.SetCharm(ch, true)
242- assertChange(ch.URL())
243+ err = svc.SetCharm(newCharm, true)
244+ assertChange(newCharm.URL())
245 assertNoChange()
246 }
247

Subscribers

People subscribed via source and target branches