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.

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)

[🤖 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/337/

review: Approve (test results)

[Simon Poirier (simpoir)]

See inline question

review: Needs Information

[Simon Poirier (simpoir)]

+1 Never mind. I just misread. Looks all good.

review: Approve

[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.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

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

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.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

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

review: Approve (test results)

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

86. By Eric Snow on 2016-10-28

Pull a little more code from 2.0.0.

=== 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-10-25 16:32:53 +0000
+++ 1.25.6/fake-juju.go	2016-10-29 14:08:30 +0000
@@ -31,11 +31,17 @@
 	coretesting "github.com/juju/juju/testing"
 	"github.com/juju/juju/testing/factory"
 	"github.com/juju/juju/version"
+	"github.com/juju/loggo"
 	"github.com/juju/names"
+	"github.com/juju/utils"
 	corecharm "gopkg.in/juju/charm.v5/charmrepo"
 	goyaml "gopkg.in/yaml.v1"
 )
 
+const (
+	envDataDir = "FAKE_JUJU_DATA_DIR"
+)
+
 func main() {
 	code := 0
 	if len(os.Args) > 1 {
@@ -69,7 +75,7 @@
 	return errors.New("command not found")
 }
 
-func bootstrap(filenames fakejujuFilenames) error {
+func bootstrap(filenames fakejujuFilenames) (returnedErr error) {
 	if err := filenames.ensureDirsExist(); err != nil {
 		return err
 	}
@@ -84,14 +90,26 @@
 	command.Env = append(command.Env, "ADMIN_PASSWORD="+password)
 	defaultSeries, _ := config.DefaultSeries()
 	command.Env = append(command.Env, "DEFAULT_SERIES="+defaultSeries)
+	command.Env = append(command.Env, envDataDir+"="+filenames.datadir)
 	stdout, err := command.StdoutPipe()
 	if err != nil {
 		return err
 	}
 	command.Start()
 
+	var whence string
+	defer func() {
+		if returnedErr != nil {
+			if err := destroyEnvironment(filenames); err != nil {
+				fmt.Printf("could not destroy environment when %s failed: %v\n", whence, err)
+			}
+			returnedErr = fmt.Errorf("bootstrap failed while %s: %v", whence, returnedErr)
+		}
+	}()
+
 	result, err := parseApiInfo(stdout)
 	if err != nil {
+		whence = "parsing bootstrap result"
 		return err
 	}
 	// Get the API info before changing it.  The new values might
@@ -103,9 +121,11 @@
 		result.password = password
 	}
 	if err := result.apply(filenames, envName); err != nil {
+		whence = "setting up fake-juju files"
 		return err
 	}
 
+	whence = "waiting-for-ready"
 	dialOpts := api.DialOpts{
 		DialAddressInterval: 50 * time.Millisecond,
 		Timeout:             5 * time.Second,
@@ -154,11 +174,6 @@
 }
 
 func destroyEnvironment(filenames fakejujuFilenames) error {
-	info, err := readProcessInfo(filenames)
-	if err != nil {
-		return err
-	}
-	filenames = newFakeJujuFilenames("", "", info.WorkDir)
 	fd, err := os.OpenFile(filenames.fifoFile(), os.O_APPEND|os.O_WRONLY, 0600)
 	if err != nil {
 		return err
@@ -228,7 +243,7 @@
 
 func newFakeJujuFilenames(datadir, logsdir, jujucfgdir string) fakejujuFilenames {
 	if datadir == "" {
-		datadir = os.Getenv("FAKE_JUJU_DATA_DIR")
+		datadir = os.Getenv(envDataDir)
 		if datadir == "" {
 			if jujucfgdir == "" {
 				jujucfgdir = os.Getenv("JUJU_HOME")
@@ -267,6 +282,12 @@
 	return filepath.Join(fj.logsdir, "fake-juju.log")
 }
 
+// jujudLogsFile() returns the path to the file where fake-juju writes
+// the jujud logs.
+func (fj fakejujuFilenames) jujudLogsFile() string {
+	return filepath.Join(fj.logsdir, "jujud.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.
@@ -317,23 +338,6 @@
 	}
 }
 
-// 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) {
@@ -353,13 +357,6 @@
 		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 {
@@ -388,6 +385,10 @@
 		return nil, err
 	}
 	uuid := string(line)
+	if !utils.IsValidUUIDString(uuid) {
+		data, _ := ioutil.ReadAll(stdout)
+		return nil, fmt.Errorf("%s\n%s", line, data)
+	}
 
 	line, _, err = buffer.ReadLine()
 	if err != nil {
@@ -395,6 +396,12 @@
 	}
 	workDir := string(line)
 
+	result := &bootstrapResult{
+		dummyEnvName: dummyEnvName,
+		cfgdir:       workDir,
+		uuid:         uuid,
+	}
+
 	store, err := configstore.NewDisk(workDir)
 	if err != nil {
 		return nil, err
@@ -403,18 +410,13 @@
 	if err != nil {
 		return nil, err
 	}
-
 	credentials := info.APICredentials()
 	endpoint := info.APIEndpoint()
-	result := &bootstrapResult{
-		dummyEnvName: dummyEnvName,
-		cfgdir:       workDir,
-		uuid:         uuid,
-		username:     credentials.User,
-		password:     credentials.Password,
-		addresses:    endpoint.Addresses,
-		caCert:       []byte(endpoint.CACert),
-	}
+	result.username = credentials.User
+	result.password = credentials.Password
+	result.addresses = endpoint.Addresses
+	result.caCert = []byte(endpoint.CACert)
+
 	return result, nil
 }
 
@@ -462,10 +464,10 @@
 type FakeJujuSuite struct {
 	jujutesting.JujuConnSuite
 
-	instanceCount  int
-	machineStarted map[string]bool
-	filenames      fakejujuFilenames
-	logFile        *os.File
+	instanceCount     int
+	machineStarted    map[string]bool
+	filenames         fakejujuFilenames
+	toCloseOnTearDown []io.Closer
 }
 
 var _ = gc.Suite(&FakeJujuSuite{})
@@ -474,6 +476,16 @@
 	var CommandOutput = (*exec.Cmd).CombinedOutput
 	s.JujuConnSuite.SetUpTest(c)
 
+	c.Assert(os.Getenv(envDataDir), gc.Not(gc.Equals), "")
+	s.filenames = newFakeJujuFilenames("", "", "")
+	// Note that LoggingSuite.SetUpTest (github.com/juju/testing/log.go),
+	// called via s.JujuConnSuite.SetUpTest(), calls loggo.ResetLogging().
+	// So we cannot set up logging before then, since any writer we
+	// register will get removed.  Consequently we lose any logs that get
+	// generated in the SetUpTest() call.
+	logFile, jujudLogFile := setUpLogging(c, s.filenames)
+	s.toCloseOnTearDown = append(s.toCloseOnTearDown, logFile, jujudLogFile)
+
 	ports := s.APIState.APIHostPorts()
 	ports[0][0].NetworkName = "dummy-provider-network"
 	err := s.State.SetAPIHostPorts(ports)
@@ -517,10 +529,6 @@
 
 	apiInfo := s.APIInfo(c)
 	jujuHome := osenv.JujuHome()
-	// IMPORTANT: don't remove this logging because it's used by the
-	// bootstrap command.
-	fmt.Println(apiInfo.EnvironTag.Id())
-	fmt.Println(jujuHome)
 
 	binPath := filepath.Join(jujuHome, "bin")
 	os.Mkdir(binPath, 0755)
@@ -530,27 +538,55 @@
 	c.Assert(err, gc.IsNil)
 	os.Setenv("PATH", binPath+":"+os.Getenv("PATH"))
 
-	s.filenames = newFakeJujuFilenames("", "", jujuHome)
+	// Once this FIFO is created, users can start sending commands.
+	// The actual handling doesn't start until TestStart() runs.
 	syscall.Mknod(s.filenames.fifoFile(), syscall.S_IFIFO|0666, 0)
 
-	// Logging
-	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)
+	// Send the info back to the bootstrap command.
+	reportInfo(apiInfo.EnvironTag.Id(), jujuHome)
 
 	dpkgCmd := exec.Command(
 		"dpkg-query", "--showformat='${Version}'", "--show", "fake-juju")
 	out, err := CommandOutput(dpkgCmd)
-	log.SetOutput(s.logFile)
 	fakeJujuDebVersion := strings.Trim(string(out), "'")
 	log.Printf("Started fake-juju-%s for %s\nJUJU_HOME=%s", fakeJujuDebVersion, version.Current, jujuHome)
 }
 
+func setUpLogging(c *gc.C, filenames fakejujuFilenames) (*os.File, *os.File) {
+	c.Assert(filenames.logsdir, gc.Not(gc.Equals), "")
+
+	// fake-juju logging
+	logPath := filenames.logsFile()
+	logFile, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
+	c.Assert(err, gc.IsNil)
+	log.SetOutput(logFile)
+
+	// jujud logging
+	logPath = filenames.jujudLogsFile()
+	jujudLogFile, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
+	c.Assert(err, gc.IsNil)
+	err = loggo.RegisterWriter("fake-juju-jujud-logs", loggo.NewSimpleWriter(jujudLogFile, &loggo.DefaultFormatter{}), loggo.TRACE)
+	c.Assert(err, gc.IsNil)
+	logger := loggo.GetLogger("fake-juju")
+	logger.Infof("--- starting logging ---")
+
+	return logFile, jujudLogFile
+}
+
+func reportInfo(uuid, jujuCfgDir string) {
+	// IMPORTANT: don't remove this logging because it's used by the
+	// bootstrap command.
+	fmt.Println(uuid)
+	fmt.Println(jujuCfgDir)
+}
+
 func (s *FakeJujuSuite) TearDownTest(c *gc.C) {
 	log.Println("Tearing down processes")
 	s.JujuConnSuite.TearDownTest(c)
-	log.Println("Closing log file")
-	s.logFile.Close()
+	log.Println("Closing log files")
+	for _, closer := range s.toCloseOnTearDown {
+		closer.Close()
+	}
 }
 
 func (s *FakeJujuSuite) TestStart(c *gc.C) {
 
=== renamed directory '2.0-beta17' => '2.0.0'
=== modified file '2.0.0/fake-juju.go'
--- 2.0-beta17/fake-juju.go	2016-10-25 16:32:53 +0000
+++ 2.0.0/fake-juju.go	2016-10-29 14:08:30 +0000
@@ -4,6 +4,7 @@
 	"bufio"
 	"encoding/json"
 	"errors"
+	"flag"
 	"fmt"
 	gc "gopkg.in/check.v1"
 	"io"
@@ -19,6 +20,7 @@
 
 	"github.com/juju/juju/agent"
 	"github.com/juju/juju/api"
+	jujucmdcommon "github.com/juju/juju/cmd/juju/common"
 	"github.com/juju/juju/cmd/juju/controller"
 	"github.com/juju/juju/instance"
 	"github.com/juju/juju/juju/osenv"
@@ -31,12 +33,20 @@
 	coretesting "github.com/juju/juju/testing"
 	"github.com/juju/juju/testing/factory"
 	"github.com/juju/juju/version"
+	"github.com/juju/loggo"
+	"github.com/juju/utils"
 	semversion "github.com/juju/version"
 	corecharm "gopkg.in/juju/charmrepo.v2-unstable"
 	"gopkg.in/juju/names.v2"
 	goyaml "gopkg.in/yaml.v1"
 )
 
+const (
+	envDataDir      = "FAKE_JUJU_DATA_DIR"
+	envLogsDir      = "FAKE_JUJU_LOGS_DIR"
+	envFailuresFile = "FAKE_JUJU_FAILURES"
+)
+
 func main() {
 	code := 0
 	if len(os.Args) > 1 {
@@ -56,49 +66,150 @@
 func handleCommand(command string) error {
 	filenames := newFakeJujuFilenames("", "", "")
 	if command == "bootstrap" {
-		return bootstrap(filenames)
+		return handleBootstrap(filenames)
 	}
 	if command == "show-controller" {
-		return apiInfo(filenames)
+		return handleAPIInfo(filenames)
 	}
 	if command == "destroy-controller" {
-		return destroyController(filenames)
+		return handleDestroyController(filenames)
 	}
 	return errors.New("command not found")
 }
 
-func bootstrap(filenames fakejujuFilenames) error {
-	argc := len(os.Args)
-	if argc < 4 {
-		return errors.New(
-			"error: controller name and cloud name are required")
+func handleBootstrap(filenames fakejujuFilenames) (returnedErr error) {
+	var args bootstrapArgs
+	if err := args.parse(); err != nil {
+		return err
 	}
 	if err := filenames.ensureDirsExist(); err != nil {
 		return err
 	}
-	// XXX Swap the 2 args for juju-2.0-final.
-	controllerName := os.Args[argc-2]
+
+	// Start the fake-juju daemon.
 	command := exec.Command(os.Args[0])
 	command.Env = os.Environ()
 	command.Env = append(
 		command.Env, "ADMIN_PASSWORD="+"pwd")
 	defaultSeries := "trusty"
 	command.Env = append(command.Env, "DEFAULT_SERIES="+defaultSeries)
+	command.Env = append(command.Env, envDataDir+"="+filenames.datadir)
 	stdout, err := command.StdoutPipe()
 	if err != nil {
 		return err
 	}
 	command.Start()
 
+	var whence string
+	defer func() {
+		if returnedErr != nil {
+			if err := destroyController(filenames); err != nil {
+				fmt.Printf("could not destroy controller when %s failed: %v\n", whence, err)
+			}
+			returnedErr = fmt.Errorf("bootstrap failed while %s: %v", whence, returnedErr)
+		}
+	}()
+
+	// Get the internal info from the daemon and store it.
 	result, err := parseApiInfo(stdout)
 	if err != nil {
-		return err
-	}
-	if err := result.apply(filenames, controllerName); err != nil {
-		return err
-	}
+		whence = "parsing bootstrap result"
+		return err
+	}
+	if err := result.copyConfig(os.Getenv("JUJU_DATA"), args.controllerName); err != nil {
+		whence = "copying config"
+		return err
+	}
+	if err := updateBootstrapResult(result); err != nil {
+		whence = "updating bootstrap result"
+		return err
+	}
+	if err := result.apply(filenames); err != nil {
+		whence = "setting up fake-juju files"
+		return err
+	}
+
+	// Wait for the daemon to finish starting up.
+	if err := waitForBootstrapCompletion(result); err != nil {
+		whence = "waiting-for-ready"
+		return err
+	}
+
+	return nil
+}
+
+// bootstrapArgs is an adaptation of bootstrapCommand from
+// github.com/juju/juju/cmd/juju/commands/bootstrap.go.
+type bootstrapArgs struct {
+	config          jujucmdcommon.ConfigFlag
+	hostedModelName string
+	credentialName  string
+
+	controllerName string
+	cloud          string
+	region         string
+}
+
+func (bsargs *bootstrapArgs) parse() error {
+	flags := flag.NewFlagSet("bootstrap", flag.ExitOnError)
+
+	var ignoredStr string
+	flags.StringVar(&ignoredStr, "constraints", "", "")
+	flags.StringVar(&ignoredStr, "bootstrap-constraints", "", "")
+	flags.StringVar(&ignoredStr, "bootstrap-series", "", "")
+	flags.StringVar(&ignoredStr, "bootstrap-image", "", "")
+	flags.StringVar(&ignoredStr, "metadata-source", "", "")
+	flags.StringVar(&ignoredStr, "to", "", "")
+	flags.StringVar(&ignoredStr, "agent-version", "", "")
+	flags.StringVar(&ignoredStr, "regions", "", "")
+
+	var ignoredBool bool
+	flags.BoolVar(&ignoredBool, "v", false, "")
+	flags.BoolVar(&ignoredBool, "build-agent", false, "")
+	flags.BoolVar(&ignoredBool, "keep-broken", false, "")
+	flags.BoolVar(&ignoredBool, "auto-upgrade", false, "")
+	flags.BoolVar(&ignoredBool, "no-gui", false, "")
+	flags.BoolVar(&ignoredBool, "clouds", false, "")
+
+	flags.Var(&bsargs.config, "config", "")
+	flags.StringVar(&bsargs.credentialName, "credential", "", "")
+	flags.StringVar(&bsargs.hostedModelName, "d", "", "")
+	flags.StringVar(&bsargs.hostedModelName, "default-model", "", "")
+
+	flags.Parse(os.Args[2:])
+
+	args := flags.Args()
+	switch len(args) {
+	case 0:
+		return fmt.Errorf("expected at least one positional arg, got none")
+	case 1:
+		bsargs.cloud = args[0]
+	case 2:
+		bsargs.cloud = args[0]
+		bsargs.controllerName = args[1]
+	default:
+		return fmt.Errorf("expected at most two positional args, got %v", args)
+	}
+
+	if i := strings.IndexRune(bsargs.cloud, '/'); i > 0 {
+		bsargs.cloud, bsargs.region = bsargs.cloud[:i], bsargs.cloud[i+1:]
+	}
+	if bsargs.controllerName == "" {
+		bsargs.controllerName = bsargs.cloud
+		if bsargs.region == "" {
+			bsargs.controllerName += "-" + bsargs.region
+		}
+	}
+
+	if bsargs.hostedModelName == "" {
+		bsargs.hostedModelName = "default"
+	}
+
+	return nil
+}
+
+func waitForBootstrapCompletion(result *bootstrapResult) error {
 	apiInfo := result.apiInfo()
-
 	dialOpts := api.DialOpts{
 		DialAddressInterval: 50 * time.Millisecond,
 		Timeout:             5 * time.Second,
@@ -128,7 +239,7 @@
 	return errors.New("invalid delta")
 }
 
-func apiInfo(filenames fakejujuFilenames) error {
+func handleAPIInfo(filenames fakejujuFilenames) error {
 	info, err := readProcessInfo(filenames)
 	if err != nil {
 		return err
@@ -137,21 +248,22 @@
 	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 handleDestroyController(filenames fakejujuFilenames) error {
+	return destroyController(filenames)
+}
+
 func destroyController(filenames fakejujuFilenames) error {
-	info, err := readProcessInfo(filenames)
-	if err != nil {
-		return err
-	}
-	filenames = newFakeJujuFilenames("", "", info.WorkDir)
 	fd, err := os.OpenFile(filenames.fifoFile(), os.O_APPEND|os.O_WRONLY, 0600)
 	if err != nil {
 		return err
@@ -203,7 +315,7 @@
 
 func newFakeJujuFilenames(datadir, logsdir, jujucfgdir string) fakejujuFilenames {
 	if datadir == "" {
-		datadir = os.Getenv("FAKE_JUJU_DATA_DIR")
+		datadir = os.Getenv(envDataDir)
 		if datadir == "" {
 			if jujucfgdir == "" {
 				jujucfgdir = os.Getenv("JUJU_DATA")
@@ -212,7 +324,7 @@
 		}
 	}
 	if logsdir == "" {
-		logsdir = os.Getenv("FAKE_JUJU_LOGS_DIR")
+		logsdir = os.Getenv(envLogsDir)
 		if logsdir == "" {
 			logsdir = datadir
 		}
@@ -242,6 +354,12 @@
 	return filepath.Join(fj.logsdir, "fake-juju.log")
 }
 
+// jujudLogsFile() returns the path to the file where fake-juju writes
+// the jujud logs.
+func (fj fakejujuFilenames) jujudLogsFile() string {
+	return filepath.Join(fj.logsdir, "jujud.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.
@@ -290,41 +408,13 @@
 	}
 }
 
-// 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 {
+func (br bootstrapResult) apply(filenames fakejujuFilenames) 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
 	}
@@ -333,6 +423,9 @@
 }
 
 func (br bootstrapResult) copyConfig(targetCfgDir, controllerName string) error {
+	if err := os.MkdirAll(targetCfgDir, 0755); err != nil {
+		return err
+	}
 	for _, name := range []string{"controllers.yaml", "models.yaml", "accounts.yaml"} {
 		source := filepath.Join(br.cfgdir, name)
 		target := filepath.Join(targetCfgDir, name)
@@ -360,8 +453,7 @@
 	return nil
 }
 
-// See github.com/juju/juju/blob/juju/testing/conn.go.
-const dummyControllerName = "kontroll"
+const dummyControllerName = jujutesting.ControllerName
 
 func parseApiInfo(stdout io.ReadCloser) (*bootstrapResult, error) {
 	buffer := bufio.NewReader(stdout)
@@ -371,6 +463,10 @@
 		return nil, err
 	}
 	uuid := string(line)
+	if !utils.IsValidUUIDString(uuid) {
+		data, _ := ioutil.ReadAll(stdout)
+		return nil, fmt.Errorf("%s\n%s", line, data)
+	}
 
 	line, _, err = buffer.ReadLine()
 	if err != nil {
@@ -378,31 +474,37 @@
 	}
 	workDir := string(line)
 
-	osenv.SetJujuXDGDataHome(workDir)
+	result := &bootstrapResult{
+		dummyControllerName: dummyControllerName,
+		cfgdir:              workDir,
+		uuid:                uuid,
+	}
+	return result, nil
+}
+
+func updateBootstrapResult(result *bootstrapResult) error {
+	osenv.SetJujuXDGDataHome(result.cfgdir)
 	store := jujuclient.NewFileClientStore()
+
 	// hard-coded value in juju testing
 	// This will be replaced in JUJU_DATA copy of the juju client config.
-	currentController := dummyControllerName
+	currentController := result.dummyControllerName
+
 	one, err := store.ControllerByName(currentController)
 	if err != nil {
-		return nil, err
+		return err
 	}
+	result.addresses = one.APIEndpoints
+	result.caCert = []byte(one.CACert)
 
 	accountDetails, err := store.AccountDetails(currentController)
 	if err != nil {
-		return nil, err
+		return err
 	}
+	result.username = accountDetails.User
+	result.password = accountDetails.Password
 
-	result := &bootstrapResult{
-		dummyControllerName: dummyControllerName,
-		cfgdir:              workDir,
-		uuid:                uuid,
-		username:            accountDetails.User,
-		password:            accountDetails.Password,
-		addresses:           one.APIEndpoints,
-		caCert:              []byte(one.CACert),
-	}
-	return result, nil
+	return nil
 }
 
 // Read the failures info file pointed by the FAKE_JUJU_FAILURES environment
@@ -411,9 +513,9 @@
 // entity transition to an error state.
 func readFailuresInfo() (map[string]bool, error) {
 	log.Println("Checking for forced failures")
-	failuresPath := os.Getenv("FAKE_JUJU_FAILURES")
+	failuresPath := os.Getenv(envFailuresFile)
 	if failuresPath == "" {
-		log.Println("No FAKE_JUJU_FAILURES env variable set")
+		log.Printf("No %s env variable set\n", envFailuresFile)
 	}
 	log.Println("Reading failures file", failuresPath)
 	failuresInfo := map[string]bool{}
@@ -449,10 +551,10 @@
 type FakeJujuSuite struct {
 	jujutesting.JujuConnSuite
 
-	instanceCount  int
-	machineStarted map[string]bool
-	filenames      fakejujuFilenames
-	logFile        *os.File
+	instanceCount     int
+	machineStarted    map[string]bool
+	filenames         fakejujuFilenames
+	toCloseOnTearDown []io.Closer
 }
 
 var _ = gc.Suite(&FakeJujuSuite{})
@@ -460,6 +562,16 @@
 func (s *FakeJujuSuite) SetUpTest(c *gc.C) {
 	s.JujuConnSuite.SetUpTest(c)
 
+	c.Assert(os.Getenv(envDataDir), gc.Not(gc.Equals), "")
+	s.filenames = newFakeJujuFilenames("", "", "")
+	// Note that LoggingSuite.SetUpTest (github.com/juju/testing/log.go),
+	// called via s.JujuConnSuite.SetUpTest(), calls loggo.ResetLogging().
+	// So we cannot set up logging before then, since any writer we
+	// register will get removed.  Consequently we lose any logs that get
+	// generated in the SetUpTest() call.
+	logFile, jujudLogFile := setUpLogging(c, s.filenames)
+	s.toCloseOnTearDown = append(s.toCloseOnTearDown, logFile, jujudLogFile)
+
 	ports := s.APIState.APIHostPorts()
 	err := s.State.SetAPIHostPorts(ports)
 	c.Assert(err, gc.IsNil)
@@ -491,7 +603,7 @@
 	c.Assert(stateServer.SetProviderAddresses(address), gc.IsNil)
 	now := time.Now()
 	sInfo := states.StatusInfo{
-		Status:  states.StatusStarted,
+		Status:  states.Started,
 		Message: "",
 		Since:   &now,
 	}
@@ -505,10 +617,6 @@
 	apiInfo := s.APIInfo(c)
 	//fmt.Println(apiInfo.Addrs[0])
 	jujuHome := osenv.JujuXDGDataHome()
-	// IMPORTANT: don't remove this logging because it's used by the
-	// bootstrap command.
-	fmt.Println(apiInfo.ModelTag.Id())
-	fmt.Println(jujuHome)
 
 	binPath := filepath.Join(jujuHome, "bin")
 	os.Mkdir(binPath, 0755)
@@ -518,24 +626,51 @@
 	c.Assert(err, gc.IsNil)
 	os.Setenv("PATH", binPath+":"+os.Getenv("PATH"))
 
-	s.filenames = newFakeJujuFilenames("", "", jujuHome)
+	// Once this FIFO is created, users can start sending commands.
+	// The actual handling doesn't start until TestStart() runs.
 	syscall.Mknod(s.filenames.fifoFile(), syscall.S_IFIFO|0666, 0)
 
-	// Logging
-	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)
+	// Send the info back to the bootstrap command.
+	reportInfo(apiInfo.ModelTag.Id(), jujuHome)
 
-	log.SetOutput(s.logFile)
 	log.Println("Started fake-juju at ", jujuHome)
-
+}
+
+func setUpLogging(c *gc.C, filenames fakejujuFilenames) (*os.File, *os.File) {
+	c.Assert(filenames.logsdir, gc.Not(gc.Equals), "")
+
+	// fake-juju logging
+	logPath := filenames.logsFile()
+	logFile, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
+	c.Assert(err, gc.IsNil)
+	log.SetOutput(logFile)
+
+	// jujud logging
+	logPath = filenames.jujudLogsFile()
+	jujudLogFile, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0666)
+	c.Assert(err, gc.IsNil)
+	err = loggo.RegisterWriter("fake-juju-jujud-logs", loggo.NewSimpleWriter(jujudLogFile, nil))
+	c.Assert(err, gc.IsNil)
+	logger := loggo.GetLogger("fake-juju")
+	logger.Infof("--- starting logging ---")
+
+	return logFile, jujudLogFile
+}
+
+func reportInfo(uuid, jujuCfgDir string) {
+	// IMPORTANT: don't remove this logging because it's used by the
+	// bootstrap command.
+	fmt.Println(uuid)
+	fmt.Println(jujuCfgDir)
 }
 
 func (s *FakeJujuSuite) TearDownTest(c *gc.C) {
 	log.Println("Tearing down processes")
 	s.JujuConnSuite.TearDownTest(c)
-	log.Println("Closing log file")
-	s.logFile.Close()
+	log.Println("Closing log files")
+	for _, closer := range s.toCloseOnTearDown {
+		closer.Close()
+	}
 }
 
 func (s *FakeJujuSuite) TestStart(c *gc.C) {
@@ -625,12 +760,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
@@ -661,19 +796,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
@@ -684,7 +819,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 {
@@ -701,7 +836,7 @@
 	time.Sleep(500 * time.Millisecond)
 	now := time.Now()
 	sInfo := states.StatusInfo{
-		Status:  states.StatusStarted,
+		Status:  states.Started,
 		Message: "",
 		Since:   &now,
 	}
@@ -734,7 +869,7 @@
 	time.Sleep(500 * time.Millisecond)
 	now := time.Now()
 	sInfo := states.StatusInfo{
-		Status:  states.StatusError,
+		Status:  states.Error,
 		Message: "machine errored",
 		Since:   &now,
 	}
@@ -753,7 +888,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
 			}
@@ -765,7 +900,7 @@
 func (s *FakeJujuSuite) startUnit(unit *state.Unit) error {
 	now := time.Now()
 	sInfo := states.StatusInfo{
-		Status:  states.StatusStarted,
+		Status:  states.Started,
 		Message: "",
 		Since:   &now,
 	}
@@ -783,7 +918,7 @@
 		return err
 	}
 	idleInfo := states.StatusInfo{
-		Status:  states.StatusIdle,
+		Status:  states.Idle,
 		Message: "",
 		Since:   &now,
 	}
@@ -798,7 +933,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-10-27 16:36:28 +0000
+++ Makefile	2016-10-29 14:08:30 +0000
@@ -63,8 +63,8 @@
 # for all versions
 
 ifndef JUJU_VERSIONS
-JUJU1_VERSIONS = 1.24.7 1.25.6
-JUJU2_VERSIONS = 2.0-beta17
+JUJU1_VERSIONS = 1.25.6
+JUJU2_VERSIONS = 2.0.0
 JUJU_VERSIONS = $(JUJU1_VERSIONS) $(JUJU2_VERSIONS)
 endif
 BUILT_VERSIONS = $(foreach version,$(JUJU_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-29 14:08:30 +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/fakejuju/testing.py'
--- python/fakejuju/testing.py	2016-10-18 20:54:27 +0000
+++ python/fakejuju/testing.py	2016-10-29 14:08:30 +0000
@@ -7,8 +7,8 @@
 
 
 JUJU1_VER = "1.25.6"
-JUJU2_VER = "2.0-beta17"
-JUJU_VER = JUJU1_VER
+JUJU2_VER = "2.0.0"
+JUJU_VER = JUJU2_VER
 
 
 class FakeJujuFixture(Fixture):
 
=== modified file 'tests/test_fake.py'
--- tests/test_fake.py	2016-09-15 20:38:52 +0000
+++ tests/test_fake.py	2016-10-29 14:08:30 +0000
@@ -37,7 +37,7 @@
         super(_JujuFakeTest, self).setUp()
 
         self.env = os.environ.copy()
-        self.juju_home = cfgdir = tempfile.mkdtemp()
+        self.juju_home = cfgdir = tempfile.mkdtemp(prefix="fake-juju-test-")
         _jujuclient.prepare("dummy", "dummy", cfgdir, self.env, JUJU_VERSION)
 
         endpoint, uuid, password = self.bootstrap("dummy", "dummy", self.env)
@@ -100,7 +100,7 @@
 
     def bootstrap(self, name, type, env):
         """Return the API endpoint after bootstrapping the controller."""
-        args = [JUJU_FAKE, "bootstrap", "--no-gui", name, type]
+        args = [JUJU_FAKE, "bootstrap", "--no-gui", type, name]
         subprocess.check_call(args, env=env)
 
         args = [JUJU_FAKE, "show-controller", "--format", "json",
@@ -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