Fix the proxy env vars in the uniter.

worker/uniter/uniter_test.go

 // Copyright 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package uniter_test
 
 import (
         "bytes"
         "crypto/sha256"
         "encoding/hex"
         "fmt"
@@ skipping 1957 matching lines @@
                 "ftp-proxy":   s.Ftp,
         })
         c.Assert(err, gc.IsNil)
         err = ctx.st.SetEnvironConfig(cfg, old)
         c.Assert(err, gc.IsNil)
         // wait for the new values...
         expected := (osenv.ProxySettings)(s)
         for attempt := coretesting.LongAttempt.Start(); attempt.Next(); {
                 if ctx.uniter.GetProxyValues() == expected {
                         // Also confirm that the values were specified for the environment.
-                        c.Assert(os.Getenv("http-proxy"), gc.Equals, expected.Http)
-                        c.Assert(os.Getenv("HTTP-PROXY"), gc.Equals, expected.Http)
-                        c.Assert(os.Getenv("https-proxy"), gc.Equals, expected.Https)
-                        c.Assert(os.Getenv("HTTPS-PROXY"), gc.Equals, expected.Https)
-                        c.Assert(os.Getenv("ftp-proxy"), gc.Equals, expected.Ftp)
-                        c.Assert(os.Getenv("FTP-PROXY"), gc.Equals, expected.Ftp)
+                        c.Assert(os.Getenv("http_proxy"), gc.Equals, expected.Http)
+                        c.Assert(os.Getenv("HTTP_PROXY"), gc.Equals, expected.Http)
+                        c.Assert(os.Getenv("https_proxy"), gc.Equals, expected.Https)
+                        c.Assert(os.Getenv("HTTPS_PROXY"), gc.Equals, expected.Https)
+                        c.Assert(os.Getenv("ftp_proxy"), gc.Equals, expected.Ftp)
+                        c.Assert(os.Getenv("FTP_PROXY"), gc.Equals, expected.Ftp)
                         return
                 }
         }
         c.Fatal("settings didn't get noticed by the uniter")
 }
 
 type runCommands []string
 
 func (cmds runCommands) step(c *gc.C, ctx *context) {
         commands := strings.Join(cmds, "\n")
@@ skipping 65 matching lines @@
 type verifyNoFile struct {
         filename string
 }
 
 func (verify verifyNoFile) step(c *gc.C, ctx *context) {
         c.Assert(verify.filename, jc.DoesNotExist)
         // Wait a short time and check again.
         time.Sleep(coretesting.ShortWait)
         c.Assert(verify.filename, jc.DoesNotExist)
 }