mstate: simplify tests

mstate: simplify tests
https://code.launchpad.net/~aramh/juju-core/17-mstate-simplify-tests/ merge/116346
(do not edit description out of merge proposal)

[aram, 2012-07-23 19:10:28]

Please take a look.

[aram, 2012-07-24 15:59:24]

Please take a look.

[aram, 2012-07-25 15:02:39]

Please take a look.

[aram, 2012-07-25 16:46:06]

Please take a look.

[niemeyer, 2012-07-26 14:26:03]

https://codereview.appspot.com/6428073/diff/10001/mstate/mgo_test.go
File mstate/mgo_test.go (right):

https://codereview.appspot.com/6428073/diff/10001/mstate/mgo_test.go#newcode11
mstate/mgo_test.go:11: session *mgo.Session
We have an mgo_test.go file in ../store as well. We should move both of them
onto one MgoSuite in juju-core/testing so we stop changing them independently.

https://codereview.appspot.com/6428073/diff/10001/mstate/open.go
File mstate/open.go (right):

https://codereview.appspot.com/6428073/diff/10001/mstate/open.go#newcode23
mstate/open.go:23: err = st.relations.EnsureIndexKey("endpoints.relationname")
I suggest having something like this as a top-level variable:

var indexes = []string{
        "endpoints.relationname",
        "endpoints.servicename",
}

Then, just iterate over them here.

https://codereview.appspot.com/6428073/diff/10001/mstate/relation.go
File mstate/relation.go (right):

https://codereview.appspot.com/6428073/diff/10001/mstate/relation.go#newcode10
mstate/relation.go:10: type RelationRole string
Oops. Things seem to have gotten mixed up here.

[aram, 2012-07-26 16:41:55]

https://codereview.appspot.com/6428073/diff/10001/mstate/mgo_test.go
File mstate/mgo_test.go (right):

https://codereview.appspot.com/6428073/diff/10001/mstate/mgo_test.go#newcode11
mstate/mgo_test.go:11: session *mgo.Session
> We have an mgo_test.go file in ../store as well. We should move both
> of them onto one MgoSuite in juju-core/testing so we stop changing them
> independently.

I'd like to do it in a subsequent branch because there are 5 branches
which depend on this and it's a pain to merge if I do it here.

https://codereview.appspot.com/6428073/diff/10001/mstate/open.go
File mstate/open.go (right):

https://codereview.appspot.com/6428073/diff/10001/mstate/open.go#newcode23
mstate/open.go:23: err = st.relations.EnsureIndexKey("endpoints.relationname")
Likewise, I did it here: https://codereview.appspot.com/6442054/

https://codereview.appspot.com/6428073/diff/10001/mstate/relation.go
File mstate/relation.go (right):

https://codereview.appspot.com/6428073/diff/10001/mstate/relation.go#newcode10
mstate/relation.go:10: type RelationRole string
On 2012/07/26 14:26:03, niemeyer wrote:
> Oops. Things seem to have gotten mixed up here.

Probably I forgot to run -req. Don't know how to fix it. I could probably
make a new branch, but there are 5 other branches with -req already set
to this branch.

[aram, 2012-07-27 10:56:02]

Please take a look.

[aram, 2012-07-27 13:58:07]

Please take a look.

[niemeyer, 2012-07-27 14:19:41]

LGTM

https://codereview.appspot.com/6428073/diff/17001/mstate/conn_test.go
File mstate/conn_test.go (right):

https://codereview.appspot.com/6428073/diff/17001/mstate/conn_test.go#newcode24
mstate/conn_test.go:24: State    *state.State
Apparently everything else here is lowercased. Any special reason for this to be
upper?

[aram, 2012-07-27 14:21:58]

*** Submitted:

mstate: simplify tests

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