Code review comment for lp:~mfoord/juju-core/jenv-warning

Reviewers: mp+209421_code.launchpad.net,

Message:
Please take a look.

Description:

https://code.launchpad.net/~mfoord/juju-core/jenv-warning/+merge/209421

(do not edit description out of merge proposal)

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

Affected files (+27, -0 lines):
   A [revision details]
   M cmd/juju/bootstrap.go
   M cmd/juju/bootstrap_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: tarmac-20140227172835-l54f642dgfcocrj0
+New revision: <email address hidden>

Index: cmd/juju/bootstrap.go
=== modified file 'cmd/juju/bootstrap.go'
--- cmd/juju/bootstrap.go 2014-02-13 03:16:09 +0000
+++ cmd/juju/bootstrap.go 2014-03-05 11:00:23 +0000
@@ -115,6 +115,7 @@
   var existing bool
   if _, err := store.ReadInfo(c.EnvName); !errors.IsNotFoundError(err) {
    existing = true
+ logger.Warningf("Found and using existing .jenv file")
   }
   environ, err := environs.PrepareFromName(c.EnvName, ctx, store)
   if err != nil {

Index: cmd/juju/bootstrap_test.go
=== modified file 'cmd/juju/bootstrap_test.go'
--- cmd/juju/bootstrap_test.go 2014-02-13 02:46:58 +0000
+++ cmd/juju/bootstrap_test.go 2014-03-05 14:45:19 +0000
@@ -8,6 +8,7 @@
   "fmt"
   "strings"

+ "github.com/loggo/loggo"
   gc "launchpad.net/gocheck"

   "launchpad.net/juju-core/cmd"
@@ -26,6 +27,7 @@
   "launchpad.net/juju-core/errors"
   "launchpad.net/juju-core/provider/dummy"
   coretesting "launchpad.net/juju-core/testing"
+ jc "launchpad.net/juju-core/testing/checkers"
   "launchpad.net/juju-core/testing/testbase"
   coretools "launchpad.net/juju-core/tools"
   "launchpad.net/juju-core/version"
@@ -315,6 +317,28 @@
   c.Check(coretesting.Stdout(ctx2), gc.Equals, "")
  }

+func (s *BootstrapSuite) TestBootstrapJenvWarning(c *gc.C) {
+ env, fake := makeEmptyFakeHome(c)
+ defer fake.Restore()
+ defaultSeriesVersion := version.Current
+ defaultSeriesVersion.Series = env.Config().DefaultSeries()
+
+ store, err := configstore.Default()
+ c.Assert(err, gc.IsNil)
+ ctx := coretesting.Context(c)
+ environs.PrepareFromName("peckham", ctx, store)
+
+ logger := "jenv.warning.test"
+ testWriter := &loggo.TestWriter{}
+ loggo.RegisterWriter(logger, testWriter, loggo.WARNING)
+ defer loggo.RemoveWriter(logger)
+
+ opc, errc := runCommand(ctx, new(BootstrapCommand), "-e", "peckham")
+ c.Assert(<-errc, gc.IsNil)
+ c.Assert((<-opc).(dummy.OpPutFile).Env, gc.Equals, "peckham")
+ c.Assert(testWriter.Log, jc.LogMatches, []string{"Found and using
existing .jenv file"})
+}
+
  func (s *BootstrapSuite) TestInvalidLocalSource(c *gc.C) {
   s.PatchValue(&version.Current.Number, version.MustParse("1.2.0"))
   env, fake := makeEmptyFakeHome(c)