all: introduce environs.Prechecker

environs/jujutest/livetests.go

 // Copyright 2011, 2012, 2013 Canonical Ltd.
 // Licensed under the AGPLv3, see LICENCE file for details.
 
 package jujutest
 
 import (
         "bytes"
         "fmt"
         "io"
         "io/ioutil"
@@ skipping 123 matching lines @@
 func (t *LiveTests) TestPrechecker(c *gc.C) {
         // Providers may implement Prechecker. If they do, then they should
         // return nil for empty constraints (excluding the null provider).
         prechecker, ok := t.Env.(environs.Prechecker)
         if !ok {
                 return
         }
 
         const series = "precise"
         var cons constraints.Value
-        c.Check(prechecker.PrecheckCreateMachine(series, cons), gc.IsNil)
-
-        inst, _ := testing.StartInstance(c, t.Env, "0")
-        c.Assert(inst, gc.NotNil)
-        container := instance.LXC
-        cons.Container = &container
-        err := prechecker.PrecheckCreateContainer(series, cons, inst)
+        c.Check(prechecker.PrecheckInstance(series, cons), gc.IsNil)
+
+        err := prechecker.PrecheckContainer(series, instance.LXC)
         // If err is nil, that is fine, some providers support containers.
         if err != nil {
                 // But for ones that don't, they should have a standard error format.
                 c.Check(err, gc.ErrorMatches, ".*provider does not support containers")
                 c.Check(err, jc.Satisfies, coreerrors.IsContainersUnsupported)
         }
 }
 
 // TestStartStop is similar to Tests.TestStartStop except
 // that it does not assume a pristine environment.
@@ skipping 763 matching lines @@
                 return err
         }
         var buf bytes.Buffer
         _, err = io.Copy(&buf, rc)
         rc.Close()
         if err != nil {
                 return err
         }
         return target.Put(targetPath, &buf, int64(buf.Len()))
 }