state: add environment persistency with UUID

worker/uniter/uniter_test.go

 package uniter_test
 
 import (
         "bytes"
         "crypto/sha256"
         "encoding/hex"
         "fmt"
         "io"
         "io/ioutil"
         . "launchpad.net/gocheck"
@@ skipping 91 matching lines @@
 
 func ut(summary string, steps ...stepper) uniterTest {
         return uniterTest{summary, steps}
 }
 
 type stepper interface {
         step(c *C, ctx *context)
 }
 
 type context struct {
-        id            int
+        uuid          string
         path          string
         dataDir       string
         s             *UniterSuite
         st            *state.State
         charms        coretesting.ResponseMap
         hooks         []string
         sch           *state.Charm
         svc           *state.Service
         unit          *state.Unit
         uniter        *uniter.Uniter
@@ skipping 11 matching lines @@
                 }
         }()
         for i, s := range steps {
                 c.Logf("step %d", i)
                 step(c, ctx, s)
         }
 }
 
 var goodHook = `
 #!/bin/bash
-juju-log UniterSuite-%d %s $JUJU_REMOTE_UNIT
+juju-log $JUJU_ENV_UUID %s $JUJU_REMOTE_UNIT
 `[1:]
 
 var badHook = `
 #!/bin/bash
-juju-log UniterSuite-%d fail-%s $JUJU_REMOTE_UNIT
+juju-log $JUJU_ENV_UUID fail-%s $JUJU_REMOTE_UNIT
 exit 1
 `[1:]
 
 func (ctx *context) writeHook(c *C, path string, good bool) {
         hook := badHook
         if good {
                 hook = goodHook
         }
-        content := fmt.Sprintf(hook, ctx.id, filepath.Base(path))
+        content := fmt.Sprintf(hook, filepath.Base(path))
         err := ioutil.WriteFile(path, []byte(content), 0755)
         c.Assert(err, IsNil)
 }
 
 func (ctx *context) matchLogHooks(c *C) (match bool, overshoot bool) {
         // hookPattern matches juju-log calls as generated by writeHook.
         hookPattern := fmt.Sprintf(`^.* INFO `+
                 `u/0(| [a-z0-9-]+:[0-9]+)`+ // juju-log badge; group matches relation id
-                `: UniterSuite-%d`+ // test badge; prevents cross-pollution
+                `: %s`+ // JUJU_ENV_UUID (context badge; prevents cross-test pollution)
                 ` ([0-9a-z-/ ]+)$`, // foo-relation-joined bar/123
-                ctx.id,
+                ctx.uuid,
         )
         // donePattern matches uniter logging that indicates a hook has run.
         donePattern := `^.* (INFO|ERROR) worker/uniter: (ran "[a-z0-9-]+" hook|hook failed)`
         hookRegexp := regexp.MustCompile(hookPattern)
         doneRegexp := regexp.MustCompile(donePattern)
 
         // pending is empty while we scan for a new hook, and holds a value while
         // we scan for output indicating that hook execution has finished; at which
         // point, we add it to...
         pending := ""
@@ skipping 647 matching lines @@
 
 func (s *UniterSuite) TestUniterSubordinates(c *C) {
         s.runUniterTests(c, subordinatesTests)
 }
 
 func (s *UniterSuite) runUniterTests(c *C, uniterTests []uniterTest) {
         for i, t := range uniterTests {
                 c.Logf("\ntest %d: %s\n", i, t.summary)
                 func() {
                         defer s.Reset(c)
+                        env, err := s.State.Environment()
+                        c.Assert(err, IsNil)
                         ctx := &context{
                                 s:       s,
                                 st:      s.State,
-                                id:      i,
+                                uuid:    env.UUID(),
                                 path:    s.unitDir,
                                 dataDir: s.dataDir,
                                 charms:  coretesting.ResponseMap{},
                         }
                         ctx.run(c, t.steps)
                 }()
         }
 }
 
 func (s *UniterSuite) TestSubordinateDying(c *C) {
@@ skipping 777 matching lines @@
         newmeta, err := goyaml.Marshal(meta)
         c.Assert(err, IsNil)
         ioutil.WriteFile(path, newmeta, 0644)
 
         f, err = os.Open(path)
         c.Assert(err, IsNil)
         defer f.Close()
         meta, err = charm.ReadMeta(f)
         c.Assert(err, IsNil)
 }