Merge lp:~ericsnowcurrently/fake-juju/juju-2.0-support into lp:~landscape/fake-juju/trunk-old

[Eric Snow]

Update to juju 2.0.0.

Also drop support for 1.24.x.

Testing instructions:

Run make test

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 63
Branch: lp:~ericsnowcurrently/fake-juju/juju-2.0-support
Jenkins: https://ci.lscape.net/job/latch-test-xenial/336/

review: Approve (test results)

[lp:~ericsnowcurrently/fake-juju/juju-2.0-support]

64. By Eric Snow on 2016-10-25

Add some comments about bootstrap.

65. By Eric Snow on 2016-10-25

Factor out waitForBootstrapCompletion().

66. By Eric Snow on 2016-10-25

Rename the command handler functions.

67. By Eric Snow on 2016-10-25

Factor out destroyController().

68. By Eric Snow on 2016-10-25

Destroy the controller if bootstrap fails.

69. By Eric Snow on 2016-10-25

Factor out updateBootstrapResult().

70. By Eric Snow on 2016-10-25

Call copyConfig() before updating the bootstrap result.

71. By Eric Snow on 2016-10-25

Handle bootstrap error cleanup centrally.

72. By Eric Snow on 2016-10-25

Capture error output from the daemon.

73. By Eric Snow on 2016-10-26

Minor touch-ups to SetUpTest().

74. By Eric Snow on 2016-10-26

Use constants for the environment variable names.

75. By Eric Snow on 2016-10-26

Add a log file for jujud logs.

76. By Eric Snow on 2016-10-26

Factor out reportInfo().

77. By Eric Snow on 2016-10-26

Ensure that the daemon runs with FAKE_JUJU_DATA_DIR set.

78. By Eric Snow on 2016-10-26

Parse all the supported "juju bootstrap" args.

79. By Eric Snow on 2016-10-26

Always ensure that the Juju cfg dir exists.

80. By Eric Snow on 2016-10-26

Support a -v bootstrap arg.

81. By Eric Snow on 2016-10-27

Set up logging right *after* calling JujuConnSuite.SetUpTest().

82. By Eric Snow on 2016-10-27

Fix bootstrap arg order in a test.

83. By Eric Snow on 2016-10-28

Merge from trunk.

84. By Eric Snow on 2016-10-28

Copy some of the 2.0.0 tweaks over to 1.25.6.

85. By Eric Snow on 2016-10-28

Default to Juju 2.x in tests.

86. By Eric Snow on 2016-10-28

Pull a little more code from 2.0.0.

Unmerged revisions

=== removed directory '1.24.7'
=== removed file '1.24.7/fake-juju.go'
--- 1.24.7/fake-juju.go	2016-06-10 17:08:28 +0000
+++ 1.24.7/fake-juju.go	1970-01-01 00:00:00 +0000
@@ -1,514 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"errors"
-	"fmt"
-	gc "gopkg.in/check.v1"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"syscall"
-	"testing"
-	"time"
-
-	"github.com/juju/juju/agent"
-	"github.com/juju/juju/api"
-	"github.com/juju/juju/environs"
-	"github.com/juju/juju/environs/configstore"
-	"github.com/juju/juju/instance"
-	"github.com/juju/juju/juju/osenv"
-	jujutesting "github.com/juju/juju/juju/testing"
-	"github.com/juju/juju/network"
-	_ "github.com/juju/juju/provider/maas"
-	"github.com/juju/juju/state"
-	coretesting "github.com/juju/juju/testing"
-	"github.com/juju/juju/testing/factory"
-	"github.com/juju/juju/version"
-	"github.com/juju/names"
-	corecharm "gopkg.in/juju/charm.v5/charmrepo"
-	goyaml "gopkg.in/yaml.v1"
-)
-
-func main() {
-	if len(os.Args) > 1 {
-		code := 0
-		err := handleCommand(os.Args[1])
-		if err != nil {
-			fmt.Println(err.Error())
-			code = 1
-		}
-		os.Exit(code)
-	}
-	t := &testing.T{}
-	coretesting.MgoTestPackage(t)
-}
-
-type processInfo struct {
-	WorkDir      string
-	EndpointAddr string
-	Uuid         string
-	CACert       string
-}
-
-func handleCommand(command string) error {
-	if command == "bootstrap" {
-		return bootstrap()
-	}
-	if command == "api-endpoints" {
-		return apiEndpoints()
-	}
-	if command == "api-info" {
-		return apiInfo()
-	}
-	if command == "destroy-environment" {
-		return destroyEnvironment()
-	}
-	return errors.New("command not found")
-}
-
-func bootstrap() error {
-	envName, password, err := environmentNameAndPassword()
-	if err != nil {
-		return err
-	}
-	command := exec.Command(os.Args[0])
-	command.Env = os.Environ()
-	command.Env = append(command.Env, "ADMIN_PASSWORD="+password)
-	stdout, err := command.StdoutPipe()
-	if err != nil {
-		return err
-	}
-	command.Start()
-	apiInfo, err := parseApiInfo(envName, stdout)
-	if err != nil {
-		return err
-	}
-	dialOpts := api.DialOpts{
-		DialAddressInterval: 50 * time.Millisecond,
-		Timeout:             5 * time.Second,
-		RetryDelay:          2 * time.Second,
-	}
-	state, err := api.Open(apiInfo, dialOpts)
-	if err != nil {
-		return err
-	}
-	client := state.Client()
-	watcher, err := client.WatchAll()
-	if err != nil {
-		return err
-	}
-	deltas, err := watcher.Next()
-	if err != nil {
-		return err
-	}
-	for _, delta := range deltas {
-		entityId := delta.Entity.EntityId()
-		if entityId.Kind == "machine" {
-			machineId, _ := entityId.Id.(string)
-			if machineId == "0" {
-				return nil
-			}
-		}
-	}
-	return errors.New("invalid delta")
-}
-
-func apiEndpoints() error {
-	info, err := readProcessInfo()
-	if err != nil {
-		return err
-	}
-	fmt.Println(info.EndpointAddr)
-	return nil
-}
-
-func apiInfo() error {
-	info, err := readProcessInfo()
-	if err != nil {
-		return err
-	}
-	fmt.Printf("{\"environ-uuid\": \"%s\", \"state-servers\": [\"%s\"]}\n", info.Uuid, info.EndpointAddr)
-	return nil
-}
-
-func destroyEnvironment() error {
-	info, err := readProcessInfo()
-	if err != nil {
-		return err
-	}
-	fifoPath := filepath.Join(info.WorkDir, "fifo")
-	fd, err := os.OpenFile(fifoPath, os.O_APPEND|os.O_WRONLY, 0600)
-	if err != nil {
-		return err
-	}
-	defer fd.Close()
-	_, err = fd.WriteString("destroy\n")
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func environmentNameAndPassword() (string, string, error) {
-	jujuHome := os.Getenv("JUJU_HOME")
-	osenv.SetJujuHome(jujuHome)
-	environs, err := environs.ReadEnvirons(
-		filepath.Join(jujuHome, "environments.yaml"))
-	if err != nil {
-		return "", "", err
-	}
-	envName := environs.Names()[0]
-	config, err := environs.Config(envName)
-	if err != nil {
-		return "", "", err
-	}
-	return envName, config.AdminSecret(), nil
-}
-
-func parseApiInfo(envName string, stdout io.ReadCloser) (*api.Info, error) {
-	buffer := bufio.NewReader(stdout)
-	line, _, err := buffer.ReadLine()
-	if err != nil {
-		return nil, err
-	}
-	uuid := string(line)
-	environTag := names.NewEnvironTag(uuid)
-	line, _, err = buffer.ReadLine()
-	if err != nil {
-		return nil, err
-	}
-	workDir := string(line)
-	store, err := configstore.NewDisk(workDir)
-	if err != nil {
-		return nil, err
-	}
-	info, err := store.ReadInfo("dummyenv")
-	if err != nil {
-		return nil, err
-	}
-	credentials := info.APICredentials()
-	endpoint := info.APIEndpoint()
-	addresses := endpoint.Addresses
-	apiInfo := &api.Info{
-		Addrs:      addresses,
-		Tag:        names.NewLocalUserTag(credentials.User),
-		Password:   credentials.Password,
-		CACert:     endpoint.CACert,
-		EnvironTag: environTag,
-	}
-	err = writeProcessInfo(envName, &processInfo{
-		WorkDir:      workDir,
-		EndpointAddr: addresses[0],
-		Uuid:         uuid,
-		CACert:       endpoint.CACert,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return apiInfo, nil
-}
-
-func readProcessInfo() (*processInfo, error) {
-	infoPath := filepath.Join(os.Getenv("JUJU_HOME"), "fakejuju")
-	data, err := ioutil.ReadFile(infoPath)
-	if err != nil {
-		return nil, err
-	}
-	info := &processInfo{}
-	err = goyaml.Unmarshal(data, info)
-	if err != nil {
-		return nil, err
-	}
-	return info, nil
-}
-
-func writeProcessInfo(envName string, info *processInfo) error {
-	jujuHome := os.Getenv("JUJU_HOME")
-	infoPath := filepath.Join(jujuHome, "fakejuju")
-	logPath := filepath.Join(jujuHome, "fake-juju.log")
-	caCertPath := filepath.Join(jujuHome, "cert.ca")
-	envPath := filepath.Join(jujuHome, "environments")
-	os.Mkdir(envPath, 0755)
-	jEnvPath := filepath.Join(envPath, envName+".jenv")
-	data, _ := goyaml.Marshal(info)
-	err := os.Symlink(filepath.Join(info.WorkDir, "fake-juju.log"), logPath)
-	if err != nil {
-		return err
-	}
-	err = os.Symlink(filepath.Join(info.WorkDir, "environments/dummyenv.jenv"), jEnvPath)
-	if err != nil {
-		return err
-	}
-	err = ioutil.WriteFile(infoPath, data, 0644)
-	if err != nil {
-		return err
-	}
-	return ioutil.WriteFile(caCertPath, []byte(info.CACert), 0644)
-}
-
-type FakeJujuSuite struct {
-	jujutesting.JujuConnSuite
-
-	instanceCount  int
-	machineStarted map[string]bool
-	fifoPath       string
-	logFile        *os.File
-}
-
-var _ = gc.Suite(&FakeJujuSuite{})
-
-func (s *FakeJujuSuite) SetUpTest(c *gc.C) {
-	var CommandOutput = (*exec.Cmd).CombinedOutput
-	s.JujuConnSuite.SetUpTest(c)
-
-	ports := s.APIState.APIHostPorts()
-	ports[0][0].NetworkName = "dummy-provider-network"
-	err := s.State.SetAPIHostPorts(ports)
-	c.Assert(err, gc.IsNil)
-
-	s.machineStarted = make(map[string]bool)
-	s.PatchValue(&corecharm.CacheDir, c.MkDir())
-	password := "dummy-password"
-	if os.Getenv("ADMIN_PASSWORD") != "" {
-		password = os.Getenv("ADMIN_PASSWORD")
-	}
-	_, err = s.State.AddUser("admin", "Admin", password, "dummy-admin")
-	c.Assert(err, gc.IsNil)
-	_, err = s.State.AddEnvironmentUser(
-		names.NewLocalUserTag("admin"), names.NewLocalUserTag("dummy-admin"), "Admin")
-	c.Assert(err, gc.IsNil)
-
-	// Create a machine to manage the environment.
-	stateServer := s.Factory.MakeMachine(c, &factory.MachineParams{
-		InstanceId: s.newInstanceId(),
-		Nonce:      agent.BootstrapNonce,
-		Jobs:       []state.MachineJob{state.JobManageEnviron, state.JobHostUnits},
-		Series:     "trusty",
-	})
-	c.Assert(stateServer.SetAgentVersion(version.Current), gc.IsNil)
-	address := network.NewScopedAddress("127.0.0.1", network.ScopeCloudLocal)
-	c.Assert(stateServer.SetProviderAddresses(address), gc.IsNil)
-	c.Assert(stateServer.SetStatus(state.StatusStarted, "", nil), gc.IsNil)
-	_, err = stateServer.SetAgentPresence()
-	c.Assert(err, gc.IsNil)
-	s.State.StartSync()
-	err = stateServer.WaitAgentPresence(coretesting.LongWait)
-	c.Assert(err, gc.IsNil)
-
-	apiInfo := s.APIInfo(c)
-	//fmt.Println(apiInfo.Addrs[0])
-	jujuHome := osenv.JujuHome()
-	fmt.Println(apiInfo.EnvironTag.Id())
-	fmt.Println(jujuHome)
-
-	binPath := filepath.Join(jujuHome, "bin")
-	os.Mkdir(binPath, 0755)
-	fakeSSHData := []byte("#!/bin/sh\nsleep 1\n")
-	fakeSSHPath := filepath.Join(binPath, "ssh")
-	err = ioutil.WriteFile(fakeSSHPath, fakeSSHData, 0755)
-	c.Assert(err, gc.IsNil)
-	os.Setenv("PATH", binPath+":"+os.Getenv("PATH"))
-
-	s.fifoPath = filepath.Join(jujuHome, "fifo")
-	syscall.Mknod(s.fifoPath, syscall.S_IFIFO|0666, 0)
-
-	// Logging
-	logPath := filepath.Join(jujuHome, "fake-juju.log")
-	s.logFile, err = os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
-	c.Assert(err, gc.IsNil)
-
-	log.SetOutput(s.logFile)
-	dpkgCmd := exec.Command(
-		"dpkg-query", "--showformat='${Version}'", "--show", "fake-juju")
-	out, err := CommandOutput(dpkgCmd)
-	fakeJujuDebVersion := strings.Trim(string(out), "'")
-	log.Printf("Started fake-juju-%s for %s\nJUJU_HOME=%s", fakeJujuDebVersion, version.Current, jujuHome)
-
-}
-
-func (s *FakeJujuSuite) TearDownTest(c *gc.C) {
-	s.JujuConnSuite.TearDownTest(c)
-	s.logFile.Close()
-}
-
-func (s *FakeJujuSuite) TestStart(c *gc.C) {
-	watcher := s.State.Watch()
-	go func() {
-		fd, err := os.Open(s.fifoPath)
-		c.Assert(err, gc.IsNil)
-		scanner := bufio.NewScanner(fd)
-		scanner.Scan()
-		watcher.Stop()
-	}()
-	for {
-		deltas, err := watcher.Next()
-		log.Println("Got deltas")
-		if err != nil {
-			if err.Error() == "watcher was stopped" {
-				log.Println("Watcher stopped")
-				break
-			}
-			log.Println("Unexpected error", err.Error())
-		}
-		c.Assert(err, gc.IsNil)
-		for _, d := range deltas {
-
-			entity, err := json.MarshalIndent(d.Entity, "", "  ")
-			c.Assert(err, gc.IsNil)
-			verb := "change"
-			if d.Removed {
-				verb = "remove"
-			}
-			log.Println("Processing delta", verb, d.Entity.EntityId().Kind, string(entity[:]))
-
-			entityId := d.Entity.EntityId()
-			if entityId.Kind == "machine" {
-				machineId, ok := entityId.Id.(string)
-				c.Assert(ok, gc.Equals, true)
-				c.Assert(s.handleAddMachine(machineId), gc.IsNil)
-			}
-			if entityId.Kind == "unit" {
-				unitId, ok := entityId.Id.(string)
-				c.Assert(ok, gc.Equals, true)
-				c.Assert(s.handleAddUnit(unitId), gc.IsNil)
-			}
-			log.Println("Done processing delta")
-		}
-	}
-}
-
-func (s *FakeJujuSuite) handleAddMachine(id string) error {
-	machine, err := s.State.Machine(id)
-	if err != nil {
-		return err
-	}
-	if instanceId, _ := machine.InstanceId(); instanceId == "" {
-		err = machine.SetProvisioned(s.newInstanceId(), agent.BootstrapNonce, nil)
-		if err != nil {
-			log.Println("Got error with SetProvisioned", err)
-			return err
-		}
-		address := network.NewScopedAddress("127.0.0.1", network.ScopeCloudLocal)
-		err = machine.SetProviderAddresses(address)
-		if err != nil {
-			log.Println("Got error with SetProviderAddresses", err)
-			return err
-		}
-	}
-	status, _ := machine.Status()
-	if status.Status == state.StatusPending {
-		if err = s.startMachine(machine); err != nil {
-			log.Println("Got error with startMachine:", err)
-			return err
-		}
-	} else if status.Status == state.StatusStarted {
-		if _, ok := s.machineStarted[id]; !ok {
-			s.machineStarted[id] = true
-			if err = s.startUnits(machine); err != nil {
-				log.Println("Got error with startUnits", err)
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (s *FakeJujuSuite) handleAddUnit(id string) error {
-	unit, err := s.State.Unit(id)
-	if err != nil {
-		log.Println("Got error with get unit", err)
-		return err
-	}
-	machineId, err := unit.AssignedMachineId()
-	if err != nil {
-		return nil
-	}
-	log.Println("Got machineId", machineId)
-	machine, err := s.State.Machine(machineId)
-	if err != nil {
-		log.Println("Got error with unit AssignedMachineId", err)
-		return err
-	}
-	machineStatus, _ := machine.Status()
-	if machineStatus.Status != state.StatusStarted {
-		return nil
-	}
-	status, _ := unit.Status()
-	if status.Status != state.StatusActive {
-		if err = s.startUnit(unit); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (s *FakeJujuSuite) startMachine(machine *state.Machine) error {
-	time.Sleep(500 * time.Millisecond)
-	err := machine.SetStatus(state.StatusStarted, "", nil)
-	if err != nil {
-		return err
-	}
-	err = machine.SetAgentVersion(version.Current)
-	if err != nil {
-		return err
-	}
-	_, err = machine.SetAgentPresence()
-	if err != nil {
-		return err
-	}
-	s.State.StartSync()
-	err = machine.WaitAgentPresence(coretesting.LongWait)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *FakeJujuSuite) startUnits(machine *state.Machine) error {
-	units, err := machine.Units()
-	if err != nil {
-		return err
-	}
-	return nil
-	for _, unit := range units {
-		unitStatus, _ := unit.Status()
-		if unitStatus.Status != state.StatusActive {
-			if err = s.startUnit(unit); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func (s *FakeJujuSuite) startUnit(unit *state.Unit) error {
-	err := unit.SetStatus(state.StatusActive, "", nil)
-	if err != nil {
-		return err
-	}
-	_, err = unit.SetAgentPresence()
-	if err != nil {
-		return err
-	}
-	s.State.StartSync()
-	err = unit.WaitAgentPresence(coretesting.LongWait)
-	if err != nil {
-		return err
-	}
-	err = unit.SetAgentStatus(state.StatusIdle, "", nil)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *FakeJujuSuite) newInstanceId() instance.Id {
-	s.instanceCount += 1
-	return instance.Id(fmt.Sprintf("id-%d", s.instanceCount))
-}

=== modified file '1.25.6/fake-juju.go'
--- 1.25.6/fake-juju.go	2016-06-10 17:07:27 +0000
+++ 1.25.6/fake-juju.go	2016-10-25 17:25:06 +0000
@@ -37,52 +37,51 @@
 )
 
 func main() {
+	code := 0
 	if len(os.Args) > 1 {
-		code := 0
 		err := handleCommand(os.Args[1])
 		if err != nil {
 			fmt.Println(err.Error())
 			code = 1
 		}
-		os.Exit(code)
+	} else {
+		// This kicks off the daemon.  See FakeJujuSuite below.
+		t := &testing.T{}
+		coretesting.MgoTestPackage(t)
 	}
-	t := &testing.T{}
-	coretesting.MgoTestPackage(t)
-}
-
-type processInfo struct {
-	Username     string
-	WorkDir      string
-	EndpointAddr string
-	Uuid         string
-	CACert       string
+	os.Exit(code)
 }
 
 func handleCommand(command string) error {
+	filenames := newFakeJujuFilenames("", "", "")
 	if command == "bootstrap" {
-		return bootstrap()
+		return bootstrap(filenames)
 	}
 	if command == "api-endpoints" {
-		return apiEndpoints()
+		return apiEndpoints(filenames)
 	}
 	if command == "api-info" {
-		return apiInfo()
+		return apiInfo(filenames)
 	}
 	if command == "destroy-environment" {
-		return destroyEnvironment()
+		return destroyEnvironment(filenames)
 	}
 	return errors.New("command not found")
 }
 
-func bootstrap() error {
+func bootstrap(filenames fakejujuFilenames) error {
+	if err := filenames.ensureDirsExist(); err != nil {
+		return err
+	}
 	envName, config, err := environmentNameAndConfig()
 	if err != nil {
 		return err
 	}
+	password := config.AdminSecret()
+
 	command := exec.Command(os.Args[0])
 	command.Env = os.Environ()
-	command.Env = append(
-		command.Env, "ADMIN_PASSWORD="+config.AdminSecret())
+	command.Env = append(command.Env, "ADMIN_PASSWORD="+password)
 	defaultSeries, _ := config.DefaultSeries()
 	command.Env = append(command.Env, "DEFAULT_SERIES="+defaultSeries)
 	stdout, err := command.StdoutPipe()
@@ -90,10 +89,23 @@
 		return err
 	}
 	command.Start()
-	apiInfo, err := parseApiInfo(envName, stdout)
+
+	result, err := parseApiInfo(stdout)
 	if err != nil {
 		return err
 	}
+	// Get the API info before changing it.  The new values might
+	// not work yet.
+	apiInfo := result.apiInfo()
+	// We actually want to report the API user we added in SetUpTest().
+	result.username = "admin"
+	if password != "" {
+		result.password = password
+	}
+	if err := result.apply(filenames, envName); err != nil {
+		return err
+	}
+
 	dialOpts := api.DialOpts{
 		DialAddressInterval: 50 * time.Millisecond,
 		Timeout:             5 * time.Second,
@@ -123,8 +135,8 @@
 	return errors.New("invalid delta")
 }
 
-func apiEndpoints() error {
-	info, err := readProcessInfo()
+func apiEndpoints(filenames fakejujuFilenames) error {
+	info, err := readProcessInfo(filenames)
 	if err != nil {
 		return err
 	}
@@ -132,23 +144,22 @@
 	return nil
 }
 
-func apiInfo() error {
-	info, err := readProcessInfo()
+func apiInfo(filenames fakejujuFilenames) error {
+	info, err := readProcessInfo(filenames)
 	if err != nil {
 		return err
 	}
-	username := strings.Replace(string(info.Username), "dummy-", "", 1)
-	fmt.Printf("{\"user\": \"%s\", \"environ-uuid\": \"%s\", \"state-servers\": [\"%s\"]}\n", username, info.Uuid, info.EndpointAddr)
+	fmt.Printf("{\"user\": \"%s\", \"password\": \"%s\", \"environ-uuid\": \"%s\", \"state-servers\": [\"%s\"]}\n", info.Username, info.Password, info.Uuid, info.EndpointAddr)
 	return nil
 }
 
-func destroyEnvironment() error {
-	info, err := readProcessInfo()
+func destroyEnvironment(filenames fakejujuFilenames) error {
+	info, err := readProcessInfo(filenames)
 	if err != nil {
 		return err
 	}
-	fifoPath := filepath.Join(info.WorkDir, "fifo")
-	fd, err := os.OpenFile(fifoPath, os.O_APPEND|os.O_WRONLY, 0600)
+	filenames = newFakeJujuFilenames("", "", info.WorkDir)
+	fd, err := os.OpenFile(filenames.fifoFile(), os.O_APPEND|os.O_WRONLY, 0600)
 	if err != nil {
 		return err
 	}
@@ -176,93 +187,235 @@
 	return envName, config, nil
 }
 
-func parseApiInfo(envName string, stdout io.ReadCloser) (*api.Info, error) {
+// processInfo holds all the information that fake-juju uses internally.
+type processInfo struct {
+	Username     string
+	Password     string
+	WorkDir      string
+	EndpointAddr string
+	Uuid         string
+	CACert       []byte
+}
+
+func readProcessInfo(filenames fakejujuFilenames) (*processInfo, error) {
+	infoPath := filenames.infoFile()
+	data, err := ioutil.ReadFile(infoPath)
+	if err != nil {
+		return nil, err
+	}
+	info := &processInfo{}
+	err = goyaml.Unmarshal(data, info)
+	if err != nil {
+		return nil, err
+	}
+	return info, nil
+}
+
+func (info processInfo) write(infoPath string) error {
+	data, _ := goyaml.Marshal(&info)
+	if err := ioutil.WriteFile(infoPath, data, 0644); err != nil {
+		return err
+	}
+	return nil
+}
+
+// fakejujuFilenames encapsulates the paths to all the directories and
+// files that are relevant to fake-juju.
+type fakejujuFilenames struct {
+	datadir string
+	logsdir string
+}
+
+func newFakeJujuFilenames(datadir, logsdir, jujucfgdir string) fakejujuFilenames {
+	if datadir == "" {
+		datadir = os.Getenv("FAKE_JUJU_DATA_DIR")
+		if datadir == "" {
+			if jujucfgdir == "" {
+				jujucfgdir = os.Getenv("JUJU_HOME")
+			}
+			datadir = jujucfgdir
+		}
+	}
+	if logsdir == "" {
+		logsdir = os.Getenv("FAKE_JUJU_LOGS_DIR")
+		if logsdir == "" {
+			logsdir = datadir
+		}
+	}
+	return fakejujuFilenames{datadir, logsdir}
+}
+
+func (fj fakejujuFilenames) ensureDirsExist() error {
+	if err := os.MkdirAll(fj.datadir, 0755); err != nil {
+		return err
+	}
+	if err := os.MkdirAll(fj.logsdir, 0755); err != nil {
+		return err
+	}
+	return nil
+}
+
+// infoFile() returns the path to the file that fake-juju uses as
+// its persistent storage for internal data.
+func (fj fakejujuFilenames) infoFile() string {
+	return filepath.Join(fj.datadir, "fakejuju")
+}
+
+// logsFile() returns the path to the file where fake-juju writes
+// its logs.  Note that the normal Juju logs are not written here.
+func (fj fakejujuFilenames) logsFile() string {
+	return filepath.Join(fj.logsdir, "fake-juju.log")
+}
+
+// fifoFile() returns the path to the FIFO file used by fake-juju.
+// The FIFO is used by the fake-juju subcommands to interact with
+// the daemon.
+func (fj fakejujuFilenames) fifoFile() string {
+	return filepath.Join(fj.datadir, "fifo")
+}
+
+// caCertFile() returns the path to the file holding the CA certificate
+// used by the Juju API server.  fake-juju writes the cert there as a
+// convenience for users.  It is not actually used for anything.
+func (fj fakejujuFilenames) caCertFile() string {
+	return filepath.Join(fj.datadir, "cert.ca")
+}
+
+// bootstrapResult encapsulates all significant information that came
+// from bootstrapping an environment.
+type bootstrapResult struct {
+	dummyEnvName string
+	cfgdir       string
+	uuid         string
+	username     string
+	password     string
+	addresses    []string
+	caCert       []byte
+}
+
+// apiInfo() composes the Juju API info corresponding to the result.
+func (br bootstrapResult) apiInfo() *api.Info {
+	return &api.Info{
+		Addrs:      br.addresses,
+		Tag:        names.NewLocalUserTag(br.username),
+		Password:   br.password,
+		CACert:     string(br.caCert),
+		EnvironTag: names.NewEnvironTag(br.uuid),
+	}
+}
+
+// fakeJujuInfo() composes, from the result, the set of information
+// that fake-juju should use internally.
+func (br bootstrapResult) fakeJujuInfo() *processInfo {
+	return &processInfo{
+		Username:     br.username,
+		Password:     br.password,
+		WorkDir:      br.cfgdir,
+		EndpointAddr: br.addresses[0],
+		Uuid:         br.uuid,
+		CACert:       br.caCert,
+	}
+}
+
+// logsSymlinkFilenames() determines the source and target paths for
+// a symlink to the fake-juju logs file.  Such a symlink is relevant
+// because the fake-juju daemon may not know where the log file is
+// meant to go. It defaults to putting the log file in the default Juju
+// config dir. In that case, a symlink should be created from there to
+// the user-defined Juju config dir ($JUJU_HOME).
+func (br bootstrapResult) logsSymlinkFilenames(targetLogsFile string) (source, target string) {
+	if os.Getenv("FAKE_JUJU_LOGS_DIR") != "" || os.Getenv("FAKE_JUJU_DATA_DIR") != "" {
+		return "", ""
+	}
+
+	filenames := newFakeJujuFilenames("", "", br.cfgdir)
+	source = filenames.logsFile()
+	target = targetLogsFile
+	return source, target
+}
+
+// jenvSymlinkFilenames() determines the source and target paths for
+// a symlink to the .jenv file for the identified environment.
+func (br bootstrapResult) jenvSymlinkFilenames(jujuHome, envName string) (source, target string) {
+	if jujuHome == "" || envName == "" {
+		return "", ""
+	}
+
+	source = filepath.Join(br.cfgdir, "environments", br.dummyEnvName+".jenv")
+	target = filepath.Join(jujuHome, "environments", envName+".jenv")
+	return source, target
+}
+
+// apply() writes out the information from the bootstrap result to the
+// various files identified by the provided filenames.
+func (br bootstrapResult) apply(filenames fakejujuFilenames, envName string) error {
+	if err := br.fakeJujuInfo().write(filenames.infoFile()); err != nil {
+		return err
+	}
+
+	logsSource, logsTarget := br.logsSymlinkFilenames(filenames.logsFile())
+	if logsSource != "" && logsTarget != "" {
+		if err := os.Symlink(logsSource, logsTarget); err != nil {
+			return err
+		}
+	}
+
+	jenvSource, jenvTarget := br.jenvSymlinkFilenames(os.Getenv("JUJU_HOME"), envName)
+	if jenvSource != "" && jenvTarget != "" {
+		if err := os.MkdirAll(filepath.Dir(jenvTarget), 0755); err != nil {
+			return err
+		}
+		if err := os.Symlink(jenvSource, jenvTarget); err != nil {
+			return err
+		}
+	}
+
+	if err := ioutil.WriteFile(filenames.caCertFile(), br.caCert, 0644); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// See github.com/juju/juju/blob/juju/testing/conn.go.
+const dummyEnvName = "dummyenv"
+
+func parseApiInfo(stdout io.ReadCloser) (*bootstrapResult, error) {
 	buffer := bufio.NewReader(stdout)
+
 	line, _, err := buffer.ReadLine()
 	if err != nil {
 		return nil, err
 	}
 	uuid := string(line)
-	environTag := names.NewEnvironTag(uuid)
+
 	line, _, err = buffer.ReadLine()
 	if err != nil {
 		return nil, err
 	}
 	workDir := string(line)
+
 	store, err := configstore.NewDisk(workDir)
 	if err != nil {
 		return nil, err
 	}
-	info, err := store.ReadInfo("dummyenv")
+	info, err := store.ReadInfo(dummyEnvName)
 	if err != nil {
 		return nil, err
 	}
+
 	credentials := info.APICredentials()
 	endpoint := info.APIEndpoint()
-	addresses := endpoint.Addresses
-	apiInfo := &api.Info{
-		Addrs:      addresses,
-		Tag:        names.NewLocalUserTag(credentials.User),
-		Password:   credentials.Password,
-		CACert:     endpoint.CACert,
-		EnvironTag: environTag,
-	}
-	err = writeProcessInfo(envName, &processInfo{
-		Username:     credentials.User,
-		WorkDir:      workDir,
-		EndpointAddr: addresses[0],
-		Uuid:         uuid,
-		CACert:       endpoint.CACert,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return apiInfo, nil
-}
-
-func readProcessInfo() (*processInfo, error) {
-	infoPath := filepath.Join(os.Getenv("JUJU_HOME"), "fakejuju")
-	data, err := ioutil.ReadFile(infoPath)
-	if err != nil {
-		return nil, err
-	}
-	info := &processInfo{}
-	err = goyaml.Unmarshal(data, info)
-	if err != nil {
-		return nil, err
-	}
-	return info, nil
-}
-
-func writeProcessInfo(envName string, info *processInfo) error {
-	var err error
-	jujuHome := os.Getenv("JUJU_HOME")
-	infoPath := filepath.Join(jujuHome, "fakejuju")
-	logsDir := os.Getenv("FAKE_JUJU_LOGS_DIR")
-	if logsDir == "" {
-		logsDir = jujuHome
-	}
-	logPath := filepath.Join(logsDir, "fake-juju.log")
-	caCertPath := filepath.Join(jujuHome, "cert.ca")
-	envPath := filepath.Join(jujuHome, "environments")
-	os.Mkdir(envPath, 0755)
-	jEnvPath := filepath.Join(envPath, envName+".jenv")
-	data, _ := goyaml.Marshal(info)
-	if os.Getenv("FAKE_JUJU_LOGS_DIR") == "" {
-		err = os.Symlink(filepath.Join(info.WorkDir, "fake-juju.log"), logPath)
-		if err != nil {
-			return err
-		}
-	}
-	err = os.Symlink(filepath.Join(info.WorkDir, "environments/dummyenv.jenv"), jEnvPath)
-	if err != nil {
-		return err
-	}
-	err = ioutil.WriteFile(infoPath, data, 0644)
-	if err != nil {
-		return err
-	}
-	return ioutil.WriteFile(caCertPath, []byte(info.CACert), 0644)
+	result := &bootstrapResult{
+		dummyEnvName: dummyEnvName,
+		cfgdir:       workDir,
+		uuid:         uuid,
+		username:     credentials.User,
+		password:     credentials.Password,
+		addresses:    endpoint.Addresses,
+		caCert:       []byte(endpoint.CACert),
+	}
+	return result, nil
 }
 
 // Read the failures info file pointed by the FAKE_JUJU_FAILURES environment
@@ -302,12 +455,16 @@
 	return failuresInfo, nil
 }
 
+//===================================================================
+// The fake-juju daemon (started by bootstrap) is found here.  It is
+// implemented as a test suite.
+
 type FakeJujuSuite struct {
 	jujutesting.JujuConnSuite
 
 	instanceCount  int
 	machineStarted map[string]bool
-	fifoPath       string
+	filenames      fakejujuFilenames
 	logFile        *os.File
 }
 
@@ -359,7 +516,6 @@
 	c.Assert(err, gc.IsNil)
 
 	apiInfo := s.APIInfo(c)
-	//fmt.Println(apiInfo.Addrs[0])
 	jujuHome := osenv.JujuHome()
 	// IMPORTANT: don't remove this logging because it's used by the
 	// bootstrap command.
@@ -374,15 +530,11 @@
 	c.Assert(err, gc.IsNil)
 	os.Setenv("PATH", binPath+":"+os.Getenv("PATH"))
 
-	s.fifoPath = filepath.Join(jujuHome, "fifo")
-	syscall.Mknod(s.fifoPath, syscall.S_IFIFO|0666, 0)
+	s.filenames = newFakeJujuFilenames("", "", jujuHome)
+	syscall.Mknod(s.filenames.fifoFile(), syscall.S_IFIFO|0666, 0)
 
 	// Logging
-	logsDir := os.Getenv("FAKE_JUJU_LOGS_DIR")
-	if logsDir == "" {
-		logsDir = jujuHome
-	}
-	logPath := filepath.Join(logsDir, "fake-juju.log")
+	logPath := s.filenames.logsFile()
 	s.logFile, err = os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
 	c.Assert(err, gc.IsNil)
 
@@ -402,16 +554,30 @@
 }
 
 func (s *FakeJujuSuite) TestStart(c *gc.C) {
+	fifoPath := s.filenames.fifoFile()
 	watcher := s.State.Watch()
 	go func() {
-		log.Println("Open commands FIFO", s.fifoPath)
-		fd, err := os.Open(s.fifoPath)
+		log.Println("Open commands FIFO", fifoPath)
+		fd, err := os.Open(fifoPath)
 		if err != nil {
 			log.Println("Failed to open commands FIFO")
 		}
 		c.Assert(err, gc.IsNil)
+		defer func() {
+			if err := fd.Close(); err != nil {
+				c.Logf("failed closing FIFO file: %s", err)
+			}
+			// Mark the controller as destroyed by renaming some files.
+			if err := os.Rename(fifoPath, fifoPath+".destroyed"); err != nil {
+				c.Logf("failed renaming FIFO file: %s", err)
+			}
+			infofile := s.filenames.infoFile()
+			if err := os.Rename(infofile, infofile+".destroyed"); err != nil {
+				c.Logf("failed renaming info file: %s", err)
+			}
+		}()
 		scanner := bufio.NewScanner(fd)
-		log.Println("Listen for commands on FIFO", s.fifoPath)
+		log.Println("Listen for commands on FIFO", fifoPath)
 		scanner.Scan()
 		log.Println("Stopping fake-juju")
 		watcher.Stop()

=== renamed directory '2.0-beta17' => '2.0.0'
=== modified file '2.0.0/fake-juju.go'
--- 2.0-beta17/fake-juju.go	2016-09-15 19:05:50 +0000
+++ 2.0.0/fake-juju.go	2016-10-25 17:25:06 +0000
@@ -38,46 +38,45 @@
 )
 
 func main() {
+	code := 0
 	if len(os.Args) > 1 {
-		code := 0
 		err := handleCommand(os.Args[1])
 		if err != nil {
 			fmt.Println(err.Error())
 			code = 1
 		}
-		os.Exit(code)
+	} else {
+		// This kicks off the daemon.  See FakeJujuSuite below.
+		t := &testing.T{}
+		coretesting.MgoTestPackage(t)
 	}
-	t := &testing.T{}
-	coretesting.MgoTestPackage(t)
-}
-
-type processInfo struct {
-	WorkDir      string
-	EndpointAddr string
-	Uuid         string
-	CACert       string
+	os.Exit(code)
 }
 
 func handleCommand(command string) error {
+	filenames := newFakeJujuFilenames("", "", "")
 	if command == "bootstrap" {
-		return bootstrap()
+		return bootstrap(filenames)
 	}
 	if command == "show-controller" {
-		return apiInfo()
+		return apiInfo(filenames)
 	}
 	if command == "destroy-controller" {
-		return destroyEnvironment()
+		return destroyController(filenames)
 	}
 	return errors.New("command not found")
 }
 
-func bootstrap() error {
+func bootstrap(filenames fakejujuFilenames) error {
 	argc := len(os.Args)
 	if argc < 4 {
 		return errors.New(
 			"error: controller name and cloud name are required")
 	}
-	envName := os.Args[argc-2]
+	if err := filenames.ensureDirsExist(); err != nil {
+		return err
+	}
+	controllerName := os.Args[argc-1]
 	command := exec.Command(os.Args[0])
 	command.Env = os.Environ()
 	command.Env = append(
@@ -89,10 +88,16 @@
 		return err
 	}
 	command.Start()
-	apiInfo, err := parseApiInfo(envName, stdout)
+
+	result, err := parseApiInfo(stdout)
 	if err != nil {
 		return err
 	}
+	if err := result.apply(filenames, controllerName); err != nil {
+		return err
+	}
+	apiInfo := result.apiInfo()
+
 	dialOpts := api.DialOpts{
 		DialAddressInterval: 50 * time.Millisecond,
 		Timeout:             5 * time.Second,
@@ -122,8 +127,8 @@
 	return errors.New("invalid delta")
 }
 
-func apiInfo() error {
-	info, err := readProcessInfo()
+func apiInfo(filenames fakejujuFilenames) error {
+	info, err := readProcessInfo(filenames)
 	if err != nil {
 		return err
 	}
@@ -131,22 +136,24 @@
 	jujuHome := os.Getenv("JUJU_DATA")
 	osenv.SetJujuXDGDataHome(jujuHome)
 	cmd := controller.NewShowControllerCommand()
-	ctx, err := coretesting.RunCommandInDir(
-		nil, cmd, os.Args[2:], info.WorkDir)
-	if err != nil {
+	if err := coretesting.InitCommand(cmd, os.Args[2:]); err != nil {
+		return err
+	}
+	ctx := coretesting.ContextForDir(nil, info.WorkDir)
+	if err := cmd.Run(ctx); err != nil {
 		return err
 	}
 	fmt.Print(ctx.Stdout)
 	return nil
 }
 
-func destroyEnvironment() error {
-	info, err := readProcessInfo()
+func destroyController(filenames fakejujuFilenames) error {
+	info, err := readProcessInfo(filenames)
 	if err != nil {
 		return err
 	}
-	fifoPath := filepath.Join(info.WorkDir, "fifo")
-	fd, err := os.OpenFile(fifoPath, os.O_APPEND|os.O_WRONLY, 0600)
+	filenames = newFakeJujuFilenames("", "", info.WorkDir)
+	fd, err := os.OpenFile(filenames.fifoFile(), os.O_APPEND|os.O_WRONLY, 0600)
 	if err != nil {
 		return err
 	}
@@ -158,13 +165,214 @@
 	return nil
 }
 
-func parseApiInfo(envName string, stdout io.ReadCloser) (*api.Info, error) {
+// processInfo holds all the information that fake-juju uses internally.
+type processInfo struct {
+	WorkDir      string
+	EndpointAddr string
+	Uuid         string
+	CACert       []byte
+}
+
+func readProcessInfo(filenames fakejujuFilenames) (*processInfo, error) {
+	infoPath := filenames.infoFile()
+	data, err := ioutil.ReadFile(infoPath)
+	if err != nil {
+		return nil, err
+	}
+	info := &processInfo{}
+	err = goyaml.Unmarshal(data, info)
+	if err != nil {
+		return nil, err
+	}
+	return info, nil
+}
+
+func (info processInfo) write(infoPath string) error {
+	data, _ := goyaml.Marshal(&info)
+	if err := ioutil.WriteFile(infoPath, data, 0644); err != nil {
+		return err
+	}
+	return nil
+}
+
+// fakejujuFilenames encapsulates the paths to all the directories and
+// files that are relevant to fake-juju.
+type fakejujuFilenames struct {
+	datadir string
+	logsdir string
+}
+
+func newFakeJujuFilenames(datadir, logsdir, jujucfgdir string) fakejujuFilenames {
+	if datadir == "" {
+		datadir = os.Getenv("FAKE_JUJU_DATA_DIR")
+		if datadir == "" {
+			if jujucfgdir == "" {
+				jujucfgdir = os.Getenv("JUJU_DATA")
+			}
+			datadir = jujucfgdir
+		}
+	}
+	if logsdir == "" {
+		logsdir = os.Getenv("FAKE_JUJU_LOGS_DIR")
+		if logsdir == "" {
+			logsdir = datadir
+		}
+	}
+	return fakejujuFilenames{datadir, logsdir}
+}
+
+func (fj fakejujuFilenames) ensureDirsExist() error {
+	if err := os.MkdirAll(fj.datadir, 0755); err != nil {
+		return err
+	}
+	if err := os.MkdirAll(fj.logsdir, 0755); err != nil {
+		return err
+	}
+	return nil
+}
+
+// infoFile() returns the path to the file that fake-juju uses as
+// its persistent storage for internal data.
+func (fj fakejujuFilenames) infoFile() string {
+	return filepath.Join(fj.datadir, "fakejuju")
+}
+
+// logsFile() returns the path to the file where fake-juju writes
+// its logs.  Note that the normal Juju logs are not written here.
+func (fj fakejujuFilenames) logsFile() string {
+	return filepath.Join(fj.logsdir, "fake-juju.log")
+}
+
+// fifoFile() returns the path to the FIFO file used by fake-juju.
+// The FIFO is used by the fake-juju subcommands to interact with
+// the daemon.
+func (fj fakejujuFilenames) fifoFile() string {
+	return filepath.Join(fj.datadir, "fifo")
+}
+
+// caCertFile() returns the path to the file holding the CA certificate
+// used by the Juju API server.  fake-juju writes the cert there as a
+// convenience for users.  It is not actually used for anything.
+func (fj fakejujuFilenames) caCertFile() string {
+	return filepath.Join(fj.datadir, "cert.ca")
+}
+
+// bootstrapResult encapsulates all significant information that came
+// from bootstrapping a controller.
+type bootstrapResult struct {
+	dummyControllerName string
+	cfgdir              string
+	uuid                string
+	username            string
+	password            string
+	addresses           []string
+	caCert              []byte
+}
+
+// apiInfo() composes the Juju API info corresponding to the result.
+func (br bootstrapResult) apiInfo() *api.Info {
+	return &api.Info{
+		Addrs:    br.addresses,
+		Tag:      names.NewUserTag(br.username),
+		Password: br.password,
+		CACert:   string(br.caCert),
+		ModelTag: names.NewModelTag(br.uuid),
+	}
+}
+
+// fakeJujuInfo() composes, from the result, the set of information
+// that fake-juju should use internally.
+func (br bootstrapResult) fakeJujuInfo() *processInfo {
+	return &processInfo{
+		WorkDir:      br.cfgdir,
+		EndpointAddr: br.addresses[0],
+		Uuid:         br.uuid,
+		CACert:       br.caCert,
+	}
+}
+
+// logsSymlinkFilenames() determines the source and target paths for
+// a symlink to the fake-juju logs file.  Such a symlink is relevant
+// because the fake-juju daemon may not know where the log file is
+// meant to go. It defaults to putting the log file in the default Juju
+// config dir. In that case, a symlink should be created from there to
+// the user-defined Juju config dir ($JUJU_DATA).
+func (br bootstrapResult) logsSymlinkFilenames(targetLogsFile string) (source, target string) {
+	if os.Getenv("FAKE_JUJU_LOGS_DIR") != "" {
+		return "", ""
+	}
+
+	filenames := newFakeJujuFilenames("", "", br.cfgdir)
+	source = filenames.logsFile()
+	target = targetLogsFile
+	return source, target
+}
+
+// apply() writes out the information from the bootstrap result to the
+// various files identified by the provided filenames.
+func (br bootstrapResult) apply(filenames fakejujuFilenames, controllerName string) error {
+	if err := br.fakeJujuInfo().write(filenames.infoFile()); err != nil {
+		return err
+	}
+
+	logsSource, logsTarget := br.logsSymlinkFilenames(filenames.logsFile())
+	if logsSource != "" && logsTarget != "" {
+		if err := os.Symlink(logsSource, logsTarget); err != nil {
+			return err
+		}
+	}
+
+	if err := br.copyConfig(os.Getenv("JUJU_DATA"), controllerName); err != nil {
+		return err
+	}
+
+	if err := ioutil.WriteFile(filenames.caCertFile(), br.caCert, 0644); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (br bootstrapResult) copyConfig(targetCfgDir, controllerName string) error {
+	for _, name := range []string{"controllers.yaml", "models.yaml", "accounts.yaml"} {
+		source := filepath.Join(br.cfgdir, name)
+		target := filepath.Join(targetCfgDir, name)
+
+		input, err := ioutil.ReadFile(source)
+		if err != nil {
+			return err
+		}
+		// Generated configuration by test fixtures has the controller name
+		// hard-coded to "kontroll". A simple replace should fix this for
+		// clients using this config and expecting a specific controller
+		// name.
+		output := strings.Replace(string(input), dummyControllerName, controllerName, -1)
+		err = ioutil.WriteFile(target, []byte(output), 0644)
+		if err != nil {
+			return err
+		}
+	}
+
+	current := filepath.Join(targetCfgDir, "current-controller")
+	if err := ioutil.WriteFile(current, []byte(controllerName), 0644); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// See github.com/juju/juju/blob/juju/testing/conn.go.
+const dummyControllerName = "kontroll"
+
+func parseApiInfo(stdout io.ReadCloser) (*bootstrapResult, error) {
 	buffer := bufio.NewReader(stdout)
+
 	line, _, err := buffer.ReadLine()
 	if err != nil {
 		return nil, err
 	}
 	uuid := string(line)
+
 	line, _, err = buffer.ReadLine()
 	if err != nil {
 		return nil, err
@@ -175,8 +383,8 @@
 	store := jujuclient.NewFileClientStore()
 	// hard-coded value in juju testing
 	// This will be replaced in JUJU_DATA copy of the juju client config.
-	currentController := "kontroll"
-	one, err := store.ControllerByName("kontroll")
+	currentController := dummyControllerName
+	one, err := store.ControllerByName(currentController)
 	if err != nil {
 		return nil, err
 	}
@@ -185,108 +393,17 @@
 	if err != nil {
 		return nil, err
 	}
-	apiInfo := &api.Info{
-		Addrs:    one.APIEndpoints,
-		Tag:      names.NewUserTag(accountDetails.User),
-		Password: accountDetails.Password,
-		CACert:   one.CACert,
-		ModelTag: names.NewModelTag(uuid),
-	}
-
-	err = writeProcessInfo(envName, &processInfo{
-		WorkDir:      workDir,
-		EndpointAddr: one.APIEndpoints[0],
-		Uuid:         uuid,
-		CACert:       one.CACert,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return apiInfo, nil
-}
-
-func readProcessInfo() (*processInfo, error) {
-	infoPath := filepath.Join(os.Getenv("JUJU_DATA"), "fakejuju")
-	data, err := ioutil.ReadFile(infoPath)
-	if err != nil {
-		return nil, err
-	}
-	info := &processInfo{}
-	err = goyaml.Unmarshal(data, info)
-	if err != nil {
-		return nil, err
-	}
-	return info, nil
-}
-
-func writeProcessInfo(envName string, info *processInfo) error {
-	var err error
-	jujuHome := os.Getenv("JUJU_DATA")
-	infoPath := filepath.Join(jujuHome, "fakejuju")
-	logsDir := os.Getenv("FAKE_JUJU_LOGS_DIR")
-	if logsDir == "" {
-		logsDir = jujuHome
-	}
-	logPath := filepath.Join(logsDir, "fake-juju.log")
-	caCertPath := filepath.Join(jujuHome, "cert.ca")
-	data, _ := goyaml.Marshal(info)
-	if os.Getenv("FAKE_JUJU_LOGS_DIR") == "" {
-		err = os.Symlink(filepath.Join(info.WorkDir, "fake-juju.log"), logPath)
-		if err != nil {
-			return err
-		}
-	}
-
-	err = copyClientConfig(
-		filepath.Join(info.WorkDir, "controllers.yaml"),
-		filepath.Join(jujuHome, "controllers.yaml"),
-		envName)
-	if err != nil {
-		return err
-	}
-	err = copyClientConfig(
-		filepath.Join(info.WorkDir, "models.yaml"),
-		filepath.Join(jujuHome, "models.yaml"),
-		envName)
-	if err != nil {
-		return err
-	}
-	err = copyClientConfig(
-		filepath.Join(info.WorkDir, "accounts.yaml"),
-		filepath.Join(jujuHome, "accounts.yaml"),
-		envName)
-	if err != nil {
-		return err
-	}
-	err = ioutil.WriteFile(
-		filepath.Join(jujuHome, "current-controller"),
-		[]byte(envName), 0644)
-	if err != nil {
-		return err
-	}
-
-	err = ioutil.WriteFile(infoPath, data, 0644)
-	if err != nil {
-		return err
-	}
-	return ioutil.WriteFile(caCertPath, []byte(info.CACert), 0644)
-}
-
-func copyClientConfig(src string, dst string, envName string) error {
-	input, err := ioutil.ReadFile(src)
-	if err != nil {
-		return err
-	}
-	// Generated configuration by test fixtures has the controller name
-	// hard-coded to "kontroll". A simple replace should fix this for
-	// clients using this config and expecting a specific controller
-	// name.
-	output := strings.Replace(string(input), "kontroll", envName, -1)
-	err = ioutil.WriteFile(dst, []byte(output), 0644)
-	if err != nil {
-		return err
-	}
-	return nil
+
+	result := &bootstrapResult{
+		dummyControllerName: dummyControllerName,
+		cfgdir:              workDir,
+		uuid:                uuid,
+		username:            accountDetails.User,
+		password:            accountDetails.Password,
+		addresses:           one.APIEndpoints,
+		caCert:              []byte(one.CACert),
+	}
+	return result, nil
 }
 
 // Read the failures info file pointed by the FAKE_JUJU_FAILURES environment
@@ -326,12 +443,16 @@
 	return failuresInfo, nil
 }
 
+//===================================================================
+// The fake-juju daemon (started by bootstrap) is found here.  It is
+// implemented as a test suite.
+
 type FakeJujuSuite struct {
 	jujutesting.JujuConnSuite
 
 	instanceCount  int
 	machineStarted map[string]bool
-	fifoPath       string
+	filenames      fakejujuFilenames
 	logFile        *os.File
 }
 
@@ -371,7 +492,7 @@
 	c.Assert(stateServer.SetProviderAddresses(address), gc.IsNil)
 	now := time.Now()
 	sInfo := states.StatusInfo{
-		Status:  states.StatusStarted,
+		Status:  states.Started,
 		Message: "",
 		Since:   &now,
 	}
@@ -398,20 +519,16 @@
 	c.Assert(err, gc.IsNil)
 	os.Setenv("PATH", binPath+":"+os.Getenv("PATH"))
 
-	s.fifoPath = filepath.Join(jujuHome, "fifo")
-	syscall.Mknod(s.fifoPath, syscall.S_IFIFO|0666, 0)
+	s.filenames = newFakeJujuFilenames("", "", jujuHome)
+	syscall.Mknod(s.filenames.fifoFile(), syscall.S_IFIFO|0666, 0)
 
 	// Logging
-	logsDir := os.Getenv("FAKE_JUJU_LOGS_DIR")
-	if logsDir == "" {
-		logsDir = jujuHome
-	}
-	logPath := filepath.Join(logsDir, "fake-juju.log")
+	logPath := s.filenames.logsFile()
 	s.logFile, err = os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
 	c.Assert(err, gc.IsNil)
 
 	log.SetOutput(s.logFile)
-	log.Println("Started fake-juju at", jujuHome)
+	log.Println("Started fake-juju at ", jujuHome)
 
 }
 
@@ -423,16 +540,30 @@
 }
 
 func (s *FakeJujuSuite) TestStart(c *gc.C) {
+	fifoPath := s.filenames.fifoFile()
 	watcher := s.State.Watch()
 	go func() {
-		log.Println("Open commands FIFO", s.fifoPath)
-		fd, err := os.Open(s.fifoPath)
+		log.Println("Open commands FIFO", fifoPath)
+		fd, err := os.Open(fifoPath)
 		if err != nil {
 			log.Println("Failed to open commands FIFO")
 		}
 		c.Assert(err, gc.IsNil)
+		defer func() {
+			if err := fd.Close(); err != nil {
+				c.Logf("failed closing FIFO file: %s", err)
+			}
+			// Mark the controller as destroyed by renaming some files.
+			if err := os.Rename(fifoPath, fifoPath+".destroyed"); err != nil {
+				c.Logf("failed renaming FIFO file: %s", err)
+			}
+			infofile := s.filenames.infoFile()
+			if err := os.Rename(infofile, infofile+".destroyed"); err != nil {
+				c.Logf("failed renaming info file: %s", err)
+			}
+		}()
 		scanner := bufio.NewScanner(fd)
-		log.Println("Listen for commands on FIFO", s.fifoPath)
+		log.Println("Listen for commands on FIFO", fifoPath)
 		scanner.Scan()
 		log.Println("Stopping fake-juju")
 		watcher.Stop()
@@ -495,12 +626,12 @@
 	}
 	status, _ := machine.Status()
 	log.Println("Machine has status:", string(status.Status), status.Message)
-	if status.Status == states.StatusPending {
+	if status.Status == states.Pending {
 		if err = s.startMachine(machine); err != nil {
 			log.Println("Got error with startMachine:", err)
 			return err
 		}
-	} else if status.Status == states.StatusStarted {
+	} else if status.Status == states.Started {
 		log.Println("Starting units on machine", id)
 		if _, ok := s.machineStarted[id]; !ok {
 			s.machineStarted[id] = true
@@ -531,19 +662,19 @@
 		return err
 	}
 	machineStatus, _ := machine.Status()
-	if machineStatus.Status != states.StatusStarted {
+	if machineStatus.Status != states.Started {
 		return nil
 	}
 	status, _ := unit.Status()
 	log.Println("Unit has status", string(status.Status), status.Message)
-	if status.Status != states.StatusActive && status.Status != states.StatusError {
+	if status.Status != states.Active && status.Status != states.Error {
 		log.Println("Start unit", id)
 		err = s.startUnit(unit)
 		if err != nil {
 			log.Println("Got error changing unit status", id, err)
 			return err
 		}
-	} else if status.Status != states.StatusError {
+	} else if status.Status != states.Error {
 		failuresInfo, err := readFailuresInfo()
 		if err != nil {
 			return err
@@ -554,7 +685,7 @@
 				log.Println("Got error checking agent status", id, err)
 				return err
 			}
-			if agentStatus.Status != states.StatusError {
+			if agentStatus.Status != states.Error {
 				log.Println("Error unit", id)
 				err = s.errorUnit(unit)
 				if err != nil {
@@ -571,7 +702,7 @@
 	time.Sleep(500 * time.Millisecond)
 	now := time.Now()
 	sInfo := states.StatusInfo{
-		Status:  states.StatusStarted,
+		Status:  states.Started,
 		Message: "",
 		Since:   &now,
 	}
@@ -604,7 +735,7 @@
 	time.Sleep(500 * time.Millisecond)
 	now := time.Now()
 	sInfo := states.StatusInfo{
-		Status:  states.StatusError,
+		Status:  states.Error,
 		Message: "machine errored",
 		Since:   &now,
 	}
@@ -623,7 +754,7 @@
 	return nil
 	for _, unit := range units {
 		unitStatus, _ := unit.Status()
-		if unitStatus.Status != states.StatusActive {
+		if unitStatus.Status != states.Active {
 			if err = s.startUnit(unit); err != nil {
 				return err
 			}
@@ -635,7 +766,7 @@
 func (s *FakeJujuSuite) startUnit(unit *state.Unit) error {
 	now := time.Now()
 	sInfo := states.StatusInfo{
-		Status:  states.StatusStarted,
+		Status:  states.Started,
 		Message: "",
 		Since:   &now,
 	}
@@ -653,7 +784,7 @@
 		return err
 	}
 	idleInfo := states.StatusInfo{
-		Status:  states.StatusIdle,
+		Status:  states.Idle,
 		Message: "",
 		Since:   &now,
 	}
@@ -668,7 +799,7 @@
 	log.Println("Erroring unit", unit.Name())
 	now := time.Now()
 	sInfo := states.StatusInfo{
-		Status:  states.StatusIdle,
+		Status:  states.Idle,
 		Message: "unit errored",
 		Since:   &now,
 	}

=== modified file 'Makefile'
--- Makefile	2016-09-20 18:26:47 +0000
+++ Makefile	2016-10-25 17:25:06 +0000
@@ -11,7 +11,7 @@
 INSTALLDIR = $(DESTDIR)/usr/bin
 INSTALLED = $(INSTALLDIR)/fake-juju-$(JUJU_VERSION)
 
-$(JUJU_VERSION)/$(JUJU_VERSION):
+$(JUJU_VERSION)/$(JUJU_VERSION): $(JUJU_VERSION)/fake-juju.go
 	case $(JUJU_VERSION) in \
 		1.*) $(MAKE) build-common PATH=$$PATH JUJU_VERSION=$(JUJU_VERSION) ;;\
 		2.*) $(MAKE) build-common PATH=/usr/lib/go-$(GO_VERSION)/bin:$$PATH JUJU_VERSION=$(JUJU_VERSION) ;;\
@@ -59,8 +59,8 @@
 else  ###########################################
 # for all versions
 
-JUJU1_VERSIONS = 1.24.7 1.25.6
-JUJU2_VERSIONS = 2.0-beta17
+JUJU1_VERSIONS = 1.25.6
+JUJU2_VERSIONS = 2.0.0
 VERSIONS = $(JUJU1_VERSIONS) $(JUJU2_VERSIONS)
 BUILT_VERSIONS = $(foreach version,$(VERSIONS),$(version)/$(version))
 

=== removed file 'patches/juju-core_1.24.7.patch'
--- patches/juju-core_1.24.7.patch	2016-03-18 11:10:52 +0000
+++ patches/juju-core_1.24.7.patch	1970-01-01 00:00:00 +0000
@@ -1,47 +0,0 @@
---- 1.24.7/src/github.com/juju/juju/testcharms/charm.go.orig	2015-06-24 12:02:02.746416146 +0200
-+++ 1.24.7/src/github.com/juju/juju/testcharms/charm.go	2015-06-24 12:03:49.810418650 +0200
-@@ -10,4 +10,6 @@
- )
- 
- // Repo provides access to the test charm repository.
--var Repo = testing.NewRepo("charm-repo", "quantal")
-+// XXX fake-juju: avoid crashing because the charm-repo dir is not there
-+//var Repo = testing.NewRepo("charm-repo", "quantal")
-+var Repo = &testing.Repo{}
-
---- 1.24.7/src/github.com/juju/juju/provider/dummy/environs.go.orig	2015-07-06 15:01:14.200568258 +0200
-+++ 1.24.7/src/github.com/juju/juju/provider/dummy/environs.go	2015-07-06 15:18:32.648549661 +0200
-@@ -642,9 +642,9 @@
- 
- // PrecheckInstance is specified in the state.Prechecker interface.
- func (*environ) PrecheckInstance(series string, cons constraints.Value, placement string) error {
--	if placement != "" && placement != "valid" {
--		return fmt.Errorf("%s placement is invalid", placement)
--	}
-+//	if placement != "" && placement != "valid" {
-+//		return fmt.Errorf("%s placement is invalid", placement)
-+//	}
- 	return nil
- }
- 
---- 1.24.7/src/github.com/juju/juju/testing/cert.go	2016-03-18 09:25:34 +0000
-+++ 1.24.7/src/github.com/juju/juju/testing/cert.go	2016-03-18 09:26:04 +0000
-@@ -52,7 +52,7 @@
- }
- 
- func mustNewCA() (string, string) {
--	cert.KeyBits = 512
-+	cert.KeyBits = 1024
- 	caCert, caKey, err := cert.NewCA("juju testing", time.Now().AddDate(10, 0, 0))
- 	if err != nil {
- 		panic(err)
-@@ -61,7 +61,7 @@
- }
- 
- func mustNewServer() (string, string) {
--	cert.KeyBits = 512
-+	cert.KeyBits = 1024
- 	var hostnames []string
- 	srvCert, srvKey, err := cert.NewServer(CACert, CAKey, time.Now().AddDate(10, 0, 0), hostnames)
- 	if err != nil {
-

=== renamed file 'patches/juju-core_2.0-beta17.patch' => 'patches/juju-core_2.0.0.patch'
--- patches/juju-core_2.0-beta17.patch	2016-09-01 22:03:22 +0000
+++ patches/juju-core_2.0.0.patch	2016-10-25 17:25:06 +0000
@@ -1,5 +1,5 @@
---- 2.0-beta17/src/github.com/juju/juju/testcharms/charm.go	2016-03-10 13:45:57.000000000 +0100
-+++ 2.0-beta17/src/github.com/juju/juju/testcharms/charm.go	2016-03-21 10:46:24.312966629 +0100
+--- 2.0.0/src/github.com/juju/juju/testcharms/charm.go	2016-03-10 13:45:57.000000000 +0100
++++ 2.0.0/src/github.com/juju/juju/testcharms/charm.go	2016-03-21 10:46:24.312966629 +0100
 @@ -17,7 +17,9 @@
  )
  
@@ -11,8 +11,8 @@
  
  // UploadCharm uploads a charm using the given charm store client, and returns
  // the resulting charm URL and charm.
---- 2.0-beta17/src/github.com/juju/juju/provider/dummy/environs.go	2015-07-06 15:01:14.200568258 +0200
-+++ 2.0-beta17/src/github.com/juju/juju/provider/dummy/environs.go	2015-07-06 15:18:32.648549661 +0200
+--- 2.0.0/src/github.com/juju/juju/provider/dummy/environs.go	2015-07-06 15:01:14.200568258 +0200
++++ 2.0.0/src/github.com/juju/juju/provider/dummy/environs.go	2015-07-06 15:18:32.648549661 +0200
 @@ -633,9 +633,9 @@
  
  // PrecheckInstance is specified in the state.Prechecker interface.
@@ -26,8 +26,8 @@
  	return nil
  }
  
---- 2.0-beta17/src/github.com/juju/juju/testing/cert.go	2016-03-18 09:25:34 +0000
-+++ 2.0-beta17/src/github.com/juju/juju/testing/cert.go	2016-03-18 09:26:04 +0000
+--- 2.0.0/src/github.com/juju/juju/testing/cert.go	2016-03-18 09:25:34 +0000
++++ 2.0.0/src/github.com/juju/juju/testing/cert.go	2016-03-18 09:26:04 +0000
 @@ -52,7 +52,7 @@
  }
  

=== modified file 'python/Makefile'
--- python/Makefile	2016-10-06 21:44:31 +0000
+++ python/Makefile	2016-10-25 17:25:06 +0000
@@ -6,4 +6,4 @@
 
 .PHONY: install-dev
 install-dev:
-	ln -s $(shell pwd)/fakejuju /usr/local/lib/python2.7/dist-packages/fakejuju
+	ln -snv $(shell pwd)/fakejuju /usr/local/lib/python2.7/dist-packages/fakejuju

=== modified file 'python/fakejuju/fakejuju.py'
--- python/fakejuju/fakejuju.py	2016-10-17 15:54:59 +0000
+++ python/fakejuju/fakejuju.py	2016-10-25 17:25:06 +0000
@@ -2,6 +2,7 @@
 
 import os.path
 
+import txjuju
 import txjuju.cli
 
 from .failures import Failures
@@ -23,15 +24,17 @@
     return os.path.join(bindir, filename)
 
 
-def set_envvars(envvars, failures_filename=None, logsdir=None):
+def set_envvars(envvars, datadir=None, failures_filename=None, logsdir=None):
     """Return the environment variables with which to run fake-juju.
 
     @param envvars: The env dict to update.
+    @param datadir: The fake-juju data directory.
     @param failures_filename: The path to the failures file that
         fake-juju will use.
     @params logsdir: The path to the directory where fake-juju will
         write its log files.
     """
+    envvars["FAKE_JUJU_DATA_DIR"] = datadir or ""
     envvars["FAKE_JUJU_FAILURES"] = failures_filename or ""
     envvars["FAKE_JUJU_LOGS_DIR"] = logsdir or ""
 
@@ -40,46 +43,47 @@
     """The fundamental details for fake-juju."""
 
     @classmethod
-    def from_version(cls, version, cfgdir,
+    def from_version(cls, version, datadir,
                      logsdir=None, failuresdir=None, bindir=None):
         """Return a new instance given the provided information.
 
         @param version: The Juju version to fake.
-        @param cfgdir: The "juju home" directory to use.
+        @param datadir: The directory in which to store files specific
+            to fake-juju.
         @param logsdir: The directory where logs will be written.
-            This defaults to cfgdir.
+            This defaults to datadir.
         @params failuresdir: The directory where failure injection
             is managed.
         @param bindir: The directory containing the fake-juju binary.
             This defaults to /usr/bin.
         """
-        if logsdir is None:
-            logsdir = cfgdir
         if failuresdir is None:
-            failuresdir = cfgdir
+            failuresdir = datadir
         filename = get_filename(version, bindir=bindir)
         failures = Failures(failuresdir)
-        return cls(filename, version, cfgdir, logsdir, failures)
+        return cls(filename, version, datadir, logsdir, failures)
 
-    def __init__(self, filename, version, cfgdir, logsdir=None, failures=None):
+    def __init__(self, filename, version, datadir,
+                 logsdir=None, failures=None):
         """
         @param filename: The path to the fake-juju binary.
         @param version: The Juju version to fake.
-        @param cfgdir: The "juju home" directory to use.
+        @param datadir: The directory in which to store files specific
+            to fake-juju.
         @param logsdir: The directory where logs will be written.
-            This defaults to cfgdir.
+            This defaults to datadir.
         @param failures: The set of fake-juju failures to use.
         """
-        logsdir = logsdir if logsdir is not None else cfgdir
-        if failures is None and cfgdir:
-            failures = Failures(cfgdir)
+        logsdir = logsdir if logsdir is not None else datadir
+        if failures is None and datadir:
+            failures = Failures(datadir)
 
         if not filename:
             raise ValueError("missing filename")
         if not version:
             raise ValueError("missing version")
-        if not cfgdir:
-            raise ValueError("missing cfgdir")
+        if not datadir:
+            raise ValueError("missing datadir")
         if not logsdir:
             raise ValueError("missing logsdir")
         if failures is None:
@@ -87,7 +91,7 @@
 
         self.filename = filename
         self.version = version
-        self.cfgdir = cfgdir
+        self.datadir = datadir
         self.logsdir = logsdir
         self.failures = failures
 
@@ -99,19 +103,19 @@
     @property
     def infofile(self):
         """The path to fake-juju's data cache."""
-        return os.path.join(self.cfgdir, "fakejuju")
+        return os.path.join(self.datadir, "fakejuju")
 
     @property
     def fifo(self):
         """The path to the fifo file that triggers shutdown."""
-        return os.path.join(self.cfgdir, "fifo")
+        return os.path.join(self.datadir, "fifo")
 
     @property
     def cacertfile(self):
         """The path to the API server's certificate."""
-        return os.path.join(self.cfgdir, "cert.ca")
+        return os.path.join(self.datadir, "cert.ca")
 
-    def cli(self, envvars=None):
+    def cli(self, cfgdir, envvars=None):
         """Return the txjuju.cli.CLI for this fake-juju.
 
         Currently fake-juju supports only the following juju subcommands:
@@ -123,10 +127,27 @@
           Note that passwords are always omited, even if requested.
         * api-endpoints
         * destroy-environment
+
+        Note that fake-juju ignores local config files.
         """
         if envvars is None:
             envvars = os.environ
         envvars = dict(envvars)
-        set_envvars(envvars, self.failures._filename, self.logsdir)
+        set_envvars(
+            envvars, self.datadir, self.failures._filename, self.logsdir)
         return txjuju.cli.CLI.from_version(
-            self.filename, self.version, self.cfgdir, envvars)
+            self.filename, self.version, cfgdir, envvars)
+
+    def bootstrap(self, name, cfgdir, admin_secret=None):
+        """Return the CLI and APIInfo after bootstrapping from scratch."""
+        from . import get_bootstrap_spec
+        spec = get_bootstrap_spec(name, admin_secret)
+        cfgfile = txjuju.prepare_for_bootstrap(spec, self.version, cfgdir)
+        cli = self.cli(cfgdir)
+        cli.bootstrap(spec, cfgfile=cfgfile)
+        api_info = cli.api_info(spec.name)
+        return cli, api_info
+
+    def is_bootstrapped(self):
+        """Return True if a fake-juju controller is running."""
+        return os.path.exists(self.fifo)

=== modified file 'python/fakejuju/testing.py'
--- python/fakejuju/testing.py	2016-10-06 22:51:41 +0000
+++ python/fakejuju/testing.py	2016-10-25 17:25:06 +0000
@@ -1,6 +1,5 @@
 # Copyright 2016 Canonical Limited.  All rights reserved.
 
-import txjuju
 from fixtures import Fixture, TempDir
 from testtools.content import content_from_file
 
@@ -8,7 +7,7 @@
 
 
 JUJU1_VER = "1.25.6"
-JUJU2_VER = "2.0-beta17"
+JUJU2_VER = "2.0.0"
 JUJU_VER = JUJU1_VER
 
 
@@ -40,29 +39,16 @@
     def setUp(self):
         super(FakeJujuFixture, self).setUp()
         self._juju_home = self.useFixture(TempDir())
-        self._juju = fakejuju.FakeJuju.make(
-            self._juju_home.path, self._version, self._logs_dir)
+        self.fakejuju = fakejuju.FakeJuju.from_version(
+            self._version, self._juju_home.path, self._logs_dir)
 
         if not self._logs_dir:
             # Attach logs as testtools details.
             self.addDetail("log-file", content_from_file(self._juju.logfile))
 
-        spec = fakejuju.get_bootstrap_spec(self._controller, self._password)
-        cfgfile = txjuju.prepare_for_bootstrap(
-            spec, self._version, self._juju_home)
-        cli = self._juju.cli()
-        cli.bootstrap(spec, cfgfile=cfgfile)
-        api_info = cli.api_info(spec.name)
-        if self._version.startswith("1."):
-            # fake-juju doesn't give us the password, so we have to
-            # set it here.
-            api_info = api_info._replace(password=self._password)
-        self.api_info = api_info
+        self._juju, self.all_api_info = self.fakejuju.bootstrap(
+            self._controller, self._password)
 
     def cleanUp(self):
         self._juju.destroy_controller(self._controller)
         super(FakeJujuFixture, self).cleanUp()
-
-    def add_failure(self, entity):
-        """Make the given entity fail with an error status."""
-        self._juju.failures.fail_entity(entity)

=== modified file 'python/fakejuju/tests/test_fakejuju.py'
--- python/fakejuju/tests/test_fakejuju.py	2016-10-17 15:36:15 +0000
+++ python/fakejuju/tests/test_fakejuju.py	2016-10-25 17:25:06 +0000
@@ -1,10 +1,16 @@
 # Copyright 2016 Canonical Limited.  All rights reserved.
 
+from contextlib import contextmanager
+import json
 import os
+import shutil
+import tempfile
 import unittest
 
 from txjuju import _juju1, _juju2
 from txjuju._utils import Executable
+import txjuju.cli
+import yaml
 
 from fakejuju.failures import Failures
 from fakejuju.fakejuju import get_filename, set_envvars, FakeJuju
@@ -44,9 +50,10 @@
     def test_all_args(self):
         """set_envvars() works correctly when given all args."""
         envvars = {}
-        set_envvars(envvars, "/spam/failures", "/eggs/logsdir")
+        set_envvars(envvars, "/spam", "/spam/failures", "/eggs/logsdir")
 
         self.assertEqual(envvars, {
+            "FAKE_JUJU_DATA_DIR": "/spam",
             "FAKE_JUJU_FAILURES": "/spam/failures",
             "FAKE_JUJU_LOGS_DIR": "/eggs/logsdir",
             })
@@ -57,6 +64,7 @@
         set_envvars(envvars)
 
         self.assertEqual(envvars, {
+            "FAKE_JUJU_DATA_DIR": "",
             "FAKE_JUJU_FAILURES": "",
             "FAKE_JUJU_LOGS_DIR": "",
             })
@@ -64,9 +72,10 @@
     def test_start_empty(self):
         """set_envvars() sets all values on an empty dict."""
         envvars = {}
-        set_envvars(envvars, "x", "y")
+        set_envvars(envvars, "w", "x", "y")
 
         self.assertEqual(envvars, {
+            "FAKE_JUJU_DATA_DIR": "w",
             "FAKE_JUJU_FAILURES": "x",
             "FAKE_JUJU_LOGS_DIR": "y",
             })
@@ -74,10 +83,11 @@
     def test_no_collisions(self):
         """set_envvars() sets all values when none are set yet."""
         envvars = {"SPAM": "eggs"}
-        set_envvars(envvars, "x", "y")
+        set_envvars(envvars, "w", "x", "y")
 
         self.assertEqual(envvars, {
             "SPAM": "eggs",
+            "FAKE_JUJU_DATA_DIR": "w",
             "FAKE_JUJU_FAILURES": "x",
             "FAKE_JUJU_LOGS_DIR": "y",
             })
@@ -85,12 +95,14 @@
     def test_empty_to_nonempty(self):
         """set_envvars() updates empty values."""
         envvars = {
+            "FAKE_JUJU_DATA_DIR": "",
             "FAKE_JUJU_FAILURES": "",
             "FAKE_JUJU_LOGS_DIR": "",
             }
-        set_envvars(envvars, "x", "y")
+        set_envvars(envvars, "w", "x", "y")
 
         self.assertEqual(envvars, {
+            "FAKE_JUJU_DATA_DIR": "w",
             "FAKE_JUJU_FAILURES": "x",
             "FAKE_JUJU_LOGS_DIR": "y",
             })
@@ -98,12 +110,14 @@
     def test_nonempty_to_nonempty(self):
         """set_envvars() overwrites existing values."""
         envvars = {
+            "FAKE_JUJU_DATA_DIR": "spam",
             "FAKE_JUJU_FAILURES": "spam",
             "FAKE_JUJU_LOGS_DIR": "ham",
             }
-        set_envvars(envvars, "x", "y")
+        set_envvars(envvars, "w", "x", "y")
 
         self.assertEqual(envvars, {
+            "FAKE_JUJU_DATA_DIR": "w",
             "FAKE_JUJU_FAILURES": "x",
             "FAKE_JUJU_LOGS_DIR": "y",
             })
@@ -111,12 +125,14 @@
     def test_nonempty_to_empty(self):
         """set_envvars() with no args "unsets" existing values."""
         envvars = {
+            "FAKE_JUJU_DATA_DIR": "w",
             "FAKE_JUJU_FAILURES": "x",
             "FAKE_JUJU_LOGS_DIR": "y",
             }
         set_envvars(envvars)
 
         self.assertEqual(envvars, {
+            "FAKE_JUJU_DATA_DIR": "",
             "FAKE_JUJU_FAILURES": "",
             "FAKE_JUJU_LOGS_DIR": "",
             })
@@ -131,7 +147,7 @@
 
         self.assertEqual(juju.filename, "/bin/dir/fake-juju-1.25.6")
         self.assertEqual(juju.version, "1.25.6")
-        self.assertEqual(juju.cfgdir, "/a/juju/home")
+        self.assertEqual(juju.datadir, "/a/juju/home")
         self.assertEqual(juju.logsdir, "/logs/dir")
         self.assertEqual(juju.failures.filename, "/failures/dir/juju-failures")
 
@@ -141,19 +157,20 @@
 
         self.assertEqual(juju.filename, "/usr/bin/fake-juju-1.25.6")
         self.assertEqual(juju.version, "1.25.6")
-        self.assertEqual(juju.cfgdir, "/my/juju/home")
+        self.assertEqual(juju.datadir, "/my/juju/home")
         self.assertEqual(juju.logsdir, "/my/juju/home")
         self.assertEqual(juju.failures.filename, "/my/juju/home/juju-failures")
 
     def test_full(self):
         """FakeJuju() works correctly when given all args."""
-        cfgdir = "/my/juju/home"
-        failures = Failures(cfgdir)
-        juju = FakeJuju("/fake-juju", "1.25.6", cfgdir, "/some/logs", failures)
+        datadir = "/my/juju/home"
+        failures = Failures(datadir)
+        juju = FakeJuju(
+            "/fake-juju", "1.25.6", datadir, "/some/logs", failures)
 
         self.assertEqual(juju.filename, "/fake-juju")
         self.assertEqual(juju.version, "1.25.6")
-        self.assertEqual(juju.cfgdir, cfgdir)
+        self.assertEqual(juju.datadir, datadir)
         self.assertEqual(juju.logsdir, "/some/logs")
         self.assertIs(juju.failures, failures)
 
@@ -163,7 +180,7 @@
 
         self.assertEqual(juju.filename, "/fake-juju")
         self.assertEqual(juju.version, "1.25.6")
-        self.assertEqual(juju.cfgdir, "/my/juju/home")
+        self.assertEqual(juju.datadir, "/my/juju/home")
         self.assertEqual(juju.logsdir, "/my/juju/home")
         self.assertEqual(juju.failures.filename, "/my/juju/home/juju-failures")
 
@@ -174,7 +191,7 @@
         juju_unicode = FakeJuju(
             u"/fake-juju", u"1.25.6", u"/x", u"/y", Failures(u"/..."))
 
-        for name in ('filename version cfgdir logsdir'.split()):
+        for name in ('filename version datadir logsdir'.split()):
             self.assertIsInstance(getattr(juju_str, name), str)
             self.assertIsInstance(getattr(juju_unicode, name), unicode)
 
@@ -192,8 +209,8 @@
         with self.assertRaises(ValueError):
             FakeJuju("/fake-juju", "", "/my/juju/home")
 
-    def test_missing_cfgdir(self):
-        """FakeJuju() fails if cfgdir is None or empty."""
+    def test_missing_datadir(self):
+        """FakeJuju() fails if datadir is None or empty."""
         with self.assertRaises(ValueError):
             FakeJuju("/fake-juju", "1.25.6", None)
         with self.assertRaises(ValueError):
@@ -226,44 +243,208 @@
     def test_cli_full(self):
         """FakeJuju.cli() works correctly when given all args."""
         juju = FakeJuju("/fake-juju", "1.25.6", "/x")
-        cli = juju.cli({"SPAM": "eggs"})
+        cli = juju.cli("/y", {"SPAM": "eggs"})
 
         self.assertEqual(
             cli._exe,
             Executable("/fake-juju", {
                 "SPAM": "eggs",
+                "FAKE_JUJU_DATA_DIR": "/x",
                 "FAKE_JUJU_FAILURES": "/x/juju-failures",
                 "FAKE_JUJU_LOGS_DIR": "/x",
-                "JUJU_HOME": "/x",
+                "JUJU_HOME": "/y",
                 }),
             )
 
     def test_cli_minimal(self):
         """FakeJuju.cli() works correctly when given minimal args."""
         juju = FakeJuju("/fake-juju", "1.25.6", "/x")
-        cli = juju.cli()
+        cli = juju.cli("/y")
 
         self.assertEqual(
             cli._exe,
             Executable("/fake-juju", dict(os.environ, **{
+                "FAKE_JUJU_DATA_DIR": "/x",
                 "FAKE_JUJU_FAILURES": "/x/juju-failures",
                 "FAKE_JUJU_LOGS_DIR": "/x",
-                "JUJU_HOME": "/x",
+                "JUJU_HOME": "/y",
                 })),
             )
 
     def test_cli_juju1(self):
         """FakeJuju.cli() works correctly for Juju 1.x."""
         juju = FakeJuju.from_version("1.25.6", "/x")
-        cli = juju.cli()
+        cli = juju.cli("/y")
 
-        self.assertEqual(cli._exe.envvars["JUJU_HOME"], "/x")
+        self.assertEqual(cli._exe.envvars["JUJU_HOME"], "/y")
         self.assertIsInstance(cli._juju, _juju1.CLIHooks)
 
     def test_cli_juju2(self):
         """FakeJuju.cli() works correctly for Juju 2.x."""
         juju = FakeJuju.from_version("2.0.0", "/x")
-        cli = juju.cli()
+        cli = juju.cli("/y")
 
-        self.assertEqual(cli._exe.envvars["JUJU_DATA"], "/x")
+        self.assertEqual(cli._exe.envvars["JUJU_DATA"], "/y")
         self.assertIsInstance(cli._juju, _juju2.CLIHooks)
+
+    def test_bootstrap(self):
+        """FakeJuju.bootstrap() bootstraps from scratch using fake-juju."""
+        expected = txjuju.cli.APIInfo(
+                endpoints=['localhost:12727'],
+                user='admin',
+                password='dummy-secret',
+                model_uuid='deadbeef-0bad-400d-8000-4b1d0d06f00d',
+                )
+        version = "1.25.6"
+        with tempdir() as testdir:
+            bindir = os.path.join(testdir, "bin")
+            datadir = os.path.join(testdir, "fakejuju")
+            cfgdir = os.path.join(testdir, ".juju")
+
+            logfilename = write_fakejuju_script(
+                version, bindir, datadir, cfgdir, expected)
+            fakejuju = FakeJuju.from_version(version, cfgdir, bindir=bindir)
+
+            cli, api_info = fakejuju.bootstrap("spam", cfgdir, "secret")
+
+            files = []
+            files.extend(os.path.join(os.path.basename(datadir), name)
+                         for name in os.listdir(datadir))
+            files.extend(os.path.join(os.path.basename(cfgdir), name)
+                         for name in os.listdir(cfgdir))
+            with open(os.path.join(cfgdir, "environments.yaml")) as envfile:
+                data = envfile.read()
+
+            cli.destroy_controller()
+            with open(logfilename) as logfile:
+                calls = [line.strip() for line in logfile]
+
+        self.maxDiff = None
+        self.assertEqual(api_info, {
+            'controller': expected,
+            None: expected._replace(model_uuid=None),
+            })
+        subcommands = []
+        for call in calls:
+            args = call.split()
+            self.assertEqual(os.path.basename(args[0]), "fake-juju-" + version)
+            subcommands.append(args[1])
+        self.assertEqual(subcommands, [
+            "bootstrap",
+            "api-info",
+            "destroy-environment",
+            ])
+        self.assertItemsEqual(files, [
+            '.juju/environments',
+            '.juju/environments.yaml',
+            'fakejuju/cert.ca',
+            'fakejuju/fake-juju.log',
+            'fakejuju/fakejuju',
+            'fakejuju/fifo',
+            ])
+        self.assertEqual(yaml.load(data), {
+            "environments": {
+                "spam": {
+                    "admin-secret": "secret",
+                    "default-series": "trusty",
+                    "type": "dummy",
+                    },
+                },
+            })
+
+    def test_is_bootstrapped_true(self):
+        """FakeJuju.is_bootstrapped() returns True if the fifo file exists."""
+        with tempdir() as datadir:
+            fakejuju = FakeJuju.from_version("1.25.6", datadir)
+            with open(fakejuju.fifo, "w"):
+                pass
+            result = fakejuju.is_bootstrapped()
+
+        self.assertTrue(result)
+
+    def test_is_bootstrapped_false(self):
+        """FakeJuju.is_bootstrapped() returns False if the fifo is gone."""
+        with tempdir() as datadir:
+            fakejuju = FakeJuju.from_version("1.25.6", datadir)
+            result = fakejuju.is_bootstrapped()
+
+        self.assertFalse(result)
+
+    def test_is_bootstrapped_datadir_missing(self):
+        """FakeJuju.is_bootstrapped() returns False if the data dir is gone."""
+        fakejuju = FakeJuju.from_version("1.25.6", "/tmp/fakejuju-no-exist")
+        result = fakejuju.is_bootstrapped()
+
+        self.assertFalse(result)
+
+
+FAKE_JUJU_SCRIPT = """\
+#!/usr/bin/env python
+
+import os.path
+import sys
+
+with open("{logfile}", "a") as logfile:
+    logfile.write(" ".join(sys.argv) + "\\n")
+
+if sys.argv[1] == "bootstrap":
+    for filename in ("cert.ca", "fake-juju.log", "fakejuju", "fifo"):
+        with open(os.path.join("{datadir}", filename), "w"):
+            pass  # Touch the file.
+    for filename in ("environments",):
+        with open(os.path.join("{cfgdir}", filename), "w"):
+            pass  # Touch the file.
+elif sys.argv[1] in ("api-info", "show-controller"):
+    print('''{output}''')
+
+"""
+
+
+def write_fakejuju_script(version, bindir, datadir, cfgdir, api_info):
+    if version.startswith("1."):
+        raw_api_info = {
+            "state-servers": api_info.endpoints,
+            "user": api_info.user,
+            "password": api_info.password,
+            "environ-uuid": api_info.model_uuid,
+            }
+    else:
+        raw_api_info = {
+            "details": {
+                "api-endpoints": api_info.endpoints,
+                },
+            "account": {
+                "user": api_info.user + "@local",
+                "password": api_info.password,
+                },
+            "models": {
+                "controller": {
+                    "uuid": api_info.model_uuid,
+                    },
+                "default": {
+                    "uuid": api_info.model_uuid,
+                    },
+                },
+            }
+    output = json.dumps(raw_api_info)
+
+    logfile = os.path.join(bindir, "calls.log")
+    script = FAKE_JUJU_SCRIPT.format(
+        datadir=datadir, cfgdir=cfgdir, logfile=logfile, output=output)
+    filename = get_filename(version, bindir)
+    os.makedirs(os.path.dirname(filename))
+    with open(filename, "w") as scriptfile:
+        scriptfile.write(script)
+    os.chmod(filename, 0o755)
+    os.makedirs(datadir)
+
+    return logfile
+
+
+@contextmanager
+def tempdir():
+    cfgdir = tempfile.mkdtemp("fakejuju-test-")
+    try:
+        yield cfgdir
+    finally:
+        shutil.rmtree(cfgdir)

=== modified file 'tests/test_fake.py'
--- tests/test_fake.py	2016-09-15 20:38:52 +0000
+++ tests/test_fake.py	2016-10-25 17:25:06 +0000
@@ -108,7 +108,7 @@
         output = subprocess.check_output(args, env=env)
         api_info = json.loads(output.decode())
         endpoint = str(api_info[name]["details"]["api-endpoints"][0])
-        model = api_info[name]["current-model"]
+        model = api_info[name]["current-model"].split("/", 1)[-1]
         uuid = api_info[name]["models"][model]["uuid"]
         password = api_info[name]["account"]["password"]
         return endpoint, uuid, password