Merge lp:~fwereade/juju-core/trivial-new-unit-test-charms into lp:~juju/juju-core/trunk

[William Reade]

testing: add useful charms

This is just 3 new charms, each of which supplies one relation of the type
indicated by its name. Nothing is using them yet; I'll be going through the
various tests step by step, to ensure that everything uses real relations,
in advance of changing AddRelation to verify that the related services
really do implement the endpoints suggested in the params.

I don't really expect these to be the *only* charms I'll need, but this is a
good start, and I'm keen to make the individual elements of this pipeline as
small and clean as possible, because the forces in play tend towards vast
and ugly diffs.

https://codereview.appspot.com/6811052/

[William Reade (fwereade)]

Reviewers: mp+132080_code.launchpad.net,

Message:
Please take a look.

Description:
testing: add useful charms

This is just 3 new charms, each of which supplies one relation of the
type
indicated by its name. Nothing is using them yet; I'll be going through
the
various tests step by step, to ensure that everything uses real
relations,
in advance of changing AddRelation to verify that the related services
really do implement the endpoints suggested in the params.

I don't really expect these to be the *only* charms I'll need, but this
is a
good start, and I'm keen to make the individual elements of this
pipeline as
small and clean as possible, because the forces in play tend towards
vast
and ugly diffs.

https://code.launchpad.net/~fwereade/juju-core/trivial-new-unit-test-charms/+merge/132080

(do not edit description out of merge proposal)

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

Affected files:
   A [revision details]
   A testing/repo/series/rel-peer/metadata.yaml
   A testing/repo/series/rel-peer/revision
   A testing/repo/series/rel-pro/metadata.yaml
   A testing/repo/series/rel-pro/revision
   A testing/repo/series/rel-req/metadata.yaml
   A testing/repo/series/rel-req/revision

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: testing/repo/series/rel-peer/metadata.yaml
=== added file 'testing/repo/series/rel-peer/metadata.yaml'
--- testing/repo/series/rel-peer/metadata.yaml 1970-01-01 00:00:00 +0000
+++ testing/repo/series/rel-peer/metadata.yaml 2012-10-30 11:48:17 +0000
@@ -0,0 +1,5 @@
+name: peer
+summary: Test charm with a peer relation
+description: Test charm with a peer relation
+peers:
+ name: ifce

Index: testing/repo/series/rel-peer/revision
=== added file 'testing/repo/series/rel-peer/revision'
--- testing/repo/series/rel-peer/revision 1970-01-01 00:00:00 +0000
+++ testing/repo/series/rel-peer/revision 2012-10-30 11:48:17 +0000
@@ -0,0 +1,1 @@
+1

Index: testing/repo/series/rel-pro/metadata.yaml
=== added file 'testing/repo/series/rel-pro/metadata.yaml'
--- testing/repo/series/rel-pro/metadata.yaml 1970-01-01 00:00:00 +0000
+++ testing/repo/series/rel-pro/metadata.yaml 2012-10-30 11:48:17 +0000
@@ -0,0 +1,5 @@
+name: pro
+summary: Test charm with a provider relation
+description: Test charm with a provider relation
+provides:
+ pname: ifce

Index: testing/repo/series/rel-pro/revision
=== added file 'testing/repo/series/rel-pro/revision'
--- testing/repo/series/rel-pro/revision 1970-01-01 00:00:00 +0000
+++ testing/repo/series/rel-pro/revision 2012-10-30 11:48:17 +0000
@@ -0,0 +1,1 @@
+1

Index: testing/repo/series/rel-req/metadata.yaml
=== added file 'testing/repo/series/rel-req/metadata.yaml'
--- testing/repo/series/rel-req/metadata.yaml 1970-01-01 00:00:00 +0000
+++ testing/repo/series/rel-req/metadata.yaml 2012-10-30 11:48:17 +0000
@@ -0,0 +1,5 @@
+name: req
+summary: Test charm with a requirer relation
+description: Test ...

[John A Meinel (jameinel)]

LGTM

https://codereview.appspot.com/6811052/

[Gustavo Niemeyer (niemeyer)]

We have charms which are used as requirer/provider/peer examples.

Do we need more? Can we get rid of existing ones?

https://codereview.appspot.com/6811052/

[William Reade (fwereade)]

On 2012/10/30 14:55:30, niemeyer wrote:
> We have charms which are used as requirer/provider/peer examples.

> Do we need more? Can we get rid of existing ones?

Discussed live; rejecting.

https://codereview.appspot.com/6811052/

Unmerged revisions

699. By William Reade on 2012-10-30

add test charms to allow future relationy unit tests to add verified relations to services

698. By Dave Cheney on 2012-10-30

worker/provisioner: fix race on config reload

Bug #1064144 was cause by a race between the PA reloading it's config -or-
observing a change to the machines collection. This proposal adds an observer
that the tests can use to wait until the PA has ack'd the configuration
change.

R=fwereade, niemeyer
CC=
https://codereview.appspot.com/6742049

697. By William Reade on 2012-10-30

state: drop obsolete relation lifecycle

drop:

* Relation.EnsureDying
* Relation.EnsureDead
* State.RemoveRelation

...and use Relation.Destroy and RelationUnit.LeaveScope instead throughout.

R=niemeyer
CC=
https://codereview.appspot.com/6812047

696. By William Reade on 2012-10-30

state: Relation.Destroy

...and `juju remove-relation`, because it's trivial now that Destroy exists.

Points to note:

* Relation.EnsureDying, Relation.EnsureDead, and State.RemoveRelation are
  now obsolete, and will be remove entirely in a followup CL; omitted here
  due to volume of change.
* It's still called remove-relation, instead of destroy-relation + alias,
  because it seems more sensible to fix remove-unit at the same time and it
  also deserves a separate CL IMO.

R=niemeyer
CC=
https://codereview.appspot.com/6783051

695. By Roger Peppe on 2012-10-30

worker/uniter: make logger predictable

The stdout pipe is closed too early by os/exec;
do the work ourselves to prevent this.

R=dfc, niemeyer
CC=
https://codereview.appspot.com/6774050

694. By William Reade on 2012-10-29

juju:implement add-relation

R=niemeyer
CC=
https://codereview.appspot.com/6761044

693. By William Reade on 2012-10-29

upstart: use better Out value

We now use the same value for upstart conf Out fields as we do --log-file
params. No idea what I did to lead myself to think it didn't work...

Also, made log file names more consistent (ie $kind-$name.log, with no
explicit "-agent")

R=rog, niemeyer
CC=
https://codereview.appspot.com/6766051

692. By William Reade on 2012-10-29

uniter/charm: verify upgrade symlink overwrite

Verifies non-existence of lp:988115 in juju-core

R=niemeyer
CC=
https://codereview.appspot.com/6760046

691. By Frank Mueller on 2012-10-29

firewaller: integrated global mode

Firewaller now recognizes the global mode. It dies a
port usage counting usage counting and opens each
used port only once and closes it after the last using unit
has gone. The handling of ports in case of a restart has
been removed from this CL to a later one.

R=
CC=
https://codereview.appspot.com/6713054

690. By Roger Peppe on 2012-10-26

cmd/builddb: fix ssl build

Also add a couple of log messages.

R=fwereade, dfc
CC=
https://codereview.appspot.com/6776051

=== added directory 'testing/repo/series/rel-peer'
=== added file 'testing/repo/series/rel-peer/metadata.yaml'
--- testing/repo/series/rel-peer/metadata.yaml	1970-01-01 00:00:00 +0000
+++ testing/repo/series/rel-peer/metadata.yaml	2012-10-30 11:53:25 +0000
@@ -0,0 +1,5 @@
+name: peer
+summary: Test charm with a peer relation
+description: Test charm with a peer relation
+peers:
+  name: ifce

=== added file 'testing/repo/series/rel-peer/revision'
--- testing/repo/series/rel-peer/revision	1970-01-01 00:00:00 +0000
+++ testing/repo/series/rel-peer/revision	2012-10-30 11:53:25 +0000
@@ -0,0 +1,1 @@
+1

=== added directory 'testing/repo/series/rel-pro'
=== added file 'testing/repo/series/rel-pro/metadata.yaml'
--- testing/repo/series/rel-pro/metadata.yaml	1970-01-01 00:00:00 +0000
+++ testing/repo/series/rel-pro/metadata.yaml	2012-10-30 11:53:25 +0000
@@ -0,0 +1,5 @@
+name: pro
+summary: Test charm with a provider relation
+description: Test charm with a provider relation
+provides:
+  pname: ifce

=== added file 'testing/repo/series/rel-pro/revision'
--- testing/repo/series/rel-pro/revision	1970-01-01 00:00:00 +0000
+++ testing/repo/series/rel-pro/revision	2012-10-30 11:53:25 +0000
@@ -0,0 +1,1 @@
+1

=== added directory 'testing/repo/series/rel-req'
=== added file 'testing/repo/series/rel-req/metadata.yaml'
--- testing/repo/series/rel-req/metadata.yaml	1970-01-01 00:00:00 +0000
+++ testing/repo/series/rel-req/metadata.yaml	2012-10-30 11:53:25 +0000
@@ -0,0 +1,5 @@
+name: req
+summary: Test charm with a requirer relation
+description: Test charm with a requirer relation
+requires:
+  rname: ifce

=== added file 'testing/repo/series/rel-req/revision'
--- testing/repo/series/rel-req/revision	1970-01-01 00:00:00 +0000
+++ testing/repo/series/rel-req/revision	2012-10-30 11:53:25 +0000
@@ -0,0 +1,1 @@
+1