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
=== 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:14:26 +0000
@@ -169,7 +169,7 @@

  func (s *JujuConnSuite) AddTestingCharm(c *C, name string) *state.Charm {
  	ch := testing.Charms.Dir("series", name)
-	ident := fmt.Sprintf("%s-%d", name, ch.Revision())
+	ident := fmt.Sprintf("%s-%d", ch.Meta().Name, ch.Revision())
  	curl := charm.MustParseURL("local:series/" + ident)
  	repo, err := charm.InferRepository(curl, testing.Charms.Path)
  	c.Assert(err, IsNil)


Index: testing/repo/series/dummy-v2/config.yaml
=== 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 @@
-options:
-  title: {default: My Title, description: A descriptive title used for the  
service., type: string}
-  outlook: {description: No default outlook., type: string}
-  username: {default: admin001, description: The name of the initial  
account (given admin permissions)., type: string}
-  skill-level: {description: A number indicating skill., type: int}


Index: testing/repo/series/dummy-v2/revision
=== 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 @@
-1
\ No newline at end of file


Index: testing/repo/series/dummy-v2/build/ignored
=== removed file 'testing/repo/series/dummy-v2/build/ignored'

Index: testing/repo/series/dummy-v2/hooks/install
=== 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 @@
-#!/bin/bash
-echo "Done!"

=== removed symlink 'testing/repo/series/dummy-v2/hooks/symlink'
=== target was u'../target'

Index: testing/repo/series/format2/metadata.yaml
=== 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:14:26 +0000
@@ -1,6 +1,6 @@
-name: dummy-v2
+name: format2
  format: 2
-summary: "That's a new dummy charm."
+summary: "Sample charm described in format 2"
  description: |
-    This is a longer description which
-    potentially contains multiple lines.
+        That's a boring charm that is described in
+        terms of format 2.


Index: testing/repo/series/upgrade1/metadata.yaml
=== 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:14:26 +0000
@@ -1,5 +1,5 @@
-name: sample
-summary: "That's a sample charm."
+name: upgrade
+summary: "Sample charm to test version changes"
  description: |
-    This is a longer description which
-    potentially contains multiple lines.
+    Sample charm to test version changes.
+    This is the old charm.


Index: testing/repo/series/upgrade2/metadata.yaml
=== 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:14:26 +0000
@@ -1,5 +1,5 @@
-name: sample
-summary: "That's a sample charm."
+name: upgrade
+summary: "Sample charm to test version changes"
  description: |
-    This is a longer description which
-    potentially contains multiple lines.
+    Sample charm to test version changes.
+    This is the new charm.


Index: testing/repo/series/dummy-v2/src/hello.c
=== 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 @@
-#include <stdio.h>
-
-main()
-{
-    printf ("Hello World!\n");
-    return 0;
-}


Index: testing/repo/series/wordpress/metadata.yaml
=== 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:14:26 +0000
@@ -18,5 +18,3 @@
      interface: varnish
      limit: 2
      optional: true
-
-


Index: worker/uniter/filter_test.go
=== 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:14:26 +0000
@@ -165,7 +165,13 @@
  }

  func (s *FilterSuite) TestCharmEvents(c *C) {
-	f, err := newFilter(s.State, s.unit.Name())
+	oldCharm := s.AddTestingCharm(c, "upgrade1")
+	svc, err := s.State.AddService("upgradetest", oldCharm)
+	c.Assert(err, IsNil)
+	unit, err := svc.AddUnit()
+	c.Assert(err, IsNil)
+
+	f, err := newFilter(s.State, unit.Name())
  	c.Assert(err, IsNil)
  	defer f.Stop()

@@ -181,48 +187,48 @@
  	assertNoChange()

  	// Request an event relative to the existing state; nothing.
-	f.WantUpgradeEvent(s.ch.URL(), false)
+	f.WantUpgradeEvent(oldCharm.URL(), false)
  	assertNoChange()

  	// Change the service in an irrelevant way; no events.
-	err = s.svc.SetExposed()
+	err = svc.SetExposed()
  	c.Assert(err, IsNil)
  	assertNoChange()

  	// Change the service's charm; new event received.
-	ch := s.AddTestingCharm(c, "dummy-v2")
-	err = s.svc.SetCharm(ch, false)
+	newCharm := s.AddTestingCharm(c, "upgrade2")
+	err = svc.SetCharm(newCharm, false)
  	c.Assert(err, IsNil)
  	assertChange := func(url *charm.URL) {
  		s.State.Sync()
  		select {
-		case sch := <-f.UpgradeEvents():
-			c.Assert(sch.URL(), DeepEquals, url)
+		case upgradeCharm := <-f.UpgradeEvents():
+			c.Assert(upgradeCharm.URL(), DeepEquals, url)
  		case <-time.After(50 * time.Millisecond):
  			c.Fatalf("timed out")
  		}
  	}
-	assertChange(ch.URL())
+	assertChange(newCharm.URL())
  	assertNoChange()

  	// Request a change relative to the original state, unforced;
  	// same event is sent.
-	f.WantUpgradeEvent(s.ch.URL(), false)
-	assertChange(ch.URL())
+	f.WantUpgradeEvent(oldCharm.URL(), false)
+	assertChange(newCharm.URL())
  	assertNoChange()

  	// Request a forced change relative to the initial state; no change...
-	f.WantUpgradeEvent(s.ch.URL(), true)
+	f.WantUpgradeEvent(oldCharm.URL(), true)
  	assertNoChange()

  	// ...and still no change when we have a forced upgrade to that state...
-	err = s.svc.SetCharm(s.ch, true)
+	err = svc.SetCharm(oldCharm, true)
  	c.Assert(err, IsNil)
  	assertNoChange()

  	// ...but a *forced* change to a different charm does generate an event.
-	err = s.svc.SetCharm(ch, true)
-	assertChange(ch.URL())
+	err = svc.SetCharm(newCharm, true)
+	assertChange(newCharm.URL())
  	assertNoChange()
  }