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

[Eric Snow]

Update to use beta17.

Update to use beta17.

Testing instructions:

Run the unit tests.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Fail
Revno: 41
Branch: lp:~ericsnowcurrently/fake-juju/beta16
Jenkins: https://ci.lscape.net/job/latch-test/10140/

review: Needs Fixing (test results)

[Simon Poirier (simpoir)]

+1 look generally good, apart from the currently broken download url.

IMHO, it would be slightly more readable to separate tests and use @unittest.skipUnless()

review: Approve

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Fail
Revno: 41
Branch: lp:~ericsnowcurrently/fake-juju/beta16
Jenkins: https://ci.lscape.net/job/latch-test/10152/

review: Needs Fixing (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Fail
Revno: 41
Branch: lp:~ericsnowcurrently/fake-juju/beta16
Jenkins: https://ci.lscape.net/job/latch-test/10173/

review: Needs Fixing (test results)

[Данило Шеган (danilo)]

First up, this branch fails in CI because of a missing python3-pip dependency: please add that to the ci-test target in the Makefile (there's already an apt-get line there, so you'll want to swap places between that and the python3 -m pip call).

I've got it passing locally with that, so reviewing further with that in mind.

[Данило Шеган (danilo)]

Eric, thanks a lot for working on this! Other than the above problem, which is guarded by the latch bot, I don't see any significant issues. I do have a few nitpicks (some of it applies to the code you just moved around), and some things I believe could be addressed in follow-up branches (like actually splitting the tests for 1.x and 2.x, which might even remove the need for the run_on_all_machines monkey-patch).

review: Approve

[lp:~ericsnowcurrently/fake-juju/beta16]

42. By Eric Snow on 2016-09-13

Fix dependency ordering.

43. By Eric Snow on 2016-09-13

Drop a superfluous line.

44. By Eric Snow on 2016-09-13

Update a comment.

45. By Eric Snow on 2016-09-13

Elaborate on the reason for the Juju2Client wrapper.

46. By Eric Snow on 2016-09-13

Use Juju terminology correctly.

47. By Eric Snow on 2016-09-13

Split the Juju 2.x tests from the Juju 1.x tests.

48. By Eric Snow on 2016-09-13

Ignore a ResourceWarning coming from jujuclient.

49. By Eric Snow on 2016-09-13

Simplify the download rule.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Fail
Revno: 49
Branch: lp:~ericsnowcurrently/fake-juju/beta16
Jenkins: https://ci.lscape.net/job/latch-test/10220/

review: Needs Fixing (test results)

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Fail
Revno: 49
Branch: lp:~ericsnowcurrently/fake-juju/beta16
Jenkins: https://ci.lscape.net/job/latch-test/10221/

review: Needs Fixing (test results)

[lp:~ericsnowcurrently/fake-juju/beta16]

50. By Eric Snow on 2016-09-15

Add a script to support instally jujuclient without PyPI.

51. By Eric Snow on 2016-09-15

Add files to support installing jujuclient without PyPI.

52. By Eric Snow on 2016-09-15

Fix go formatting.

53. By Eric Snow on 2016-09-15

Install jujuclient from a local archive rather than PyPI.

54. By Eric Snow on 2016-09-15

Always delete the Go src dir.

55. By Eric Snow on 2016-09-15

Move the jujuclient archives under the tests dir.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Fail
Revno: 55
Branch: lp:~ericsnowcurrently/fake-juju/beta16
Jenkins: https://ci.lscape.net/job/latch-test-xenial/2/

review: Needs Fixing (test results)

[lp:~ericsnowcurrently/fake-juju/beta16]

56. By Eric Snow on 2016-09-15

Ignore a missing directory.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 56
Branch: lp:~ericsnowcurrently/fake-juju/beta16
Jenkins: https://ci.lscape.net/job/latch-test-xenial/3/

review: Approve (test results)

[lp:~ericsnowcurrently/fake-juju/beta16]

57. By Eric Snow on 2016-09-15

lint

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 57
Branch: lp:~ericsnowcurrently/fake-juju/beta16
Jenkins: https://ci.lscape.net/job/latch-test-xenial/4/

review: Approve (test results)

[lp:~ericsnowcurrently/fake-juju/beta16]

58. By Eric Snow on 2016-09-15

Hush up pyflakes.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 58
Branch: lp:~ericsnowcurrently/fake-juju/beta16
Jenkins: https://ci.lscape.net/job/latch-test-xenial/5/

review: Approve (test results)

=== renamed directory '2.0-beta13' => '2.0-beta17'
=== modified file '2.0-beta17/fake-juju.go'
--- 2.0-beta13/fake-juju.go	2016-07-19 19:03:20 +0000
+++ 2.0-beta17/fake-juju.go	2016-09-15 20:39:05 +0000
@@ -2,39 +2,39 @@
 
 import (
 	"bufio"
+	"encoding/json"
+	"errors"
 	"fmt"
 	gc "gopkg.in/check.v1"
+	"io"
+	"io/ioutil"
+	"log"
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"syscall"
 	"testing"
 	"time"
-	"encoding/json"
-	"errors"
-	"io/ioutil"
-	"log"
-	"strings"
 
 	"github.com/juju/juju/agent"
 	"github.com/juju/juju/api"
-	"github.com/juju/juju/juju/osenv"
-	"github.com/juju/juju/network"
-	"github.com/juju/juju/state"
-	states "github.com/juju/juju/status"
 	"github.com/juju/juju/cmd/juju/controller"
 	"github.com/juju/juju/instance"
+	"github.com/juju/juju/juju/osenv"
 	jujutesting "github.com/juju/juju/juju/testing"
 	"github.com/juju/juju/jujuclient"
+	"github.com/juju/juju/network"
 	_ "github.com/juju/juju/provider/maas"
+	"github.com/juju/juju/state"
+	states "github.com/juju/juju/status"
 	coretesting "github.com/juju/juju/testing"
 	"github.com/juju/juju/testing/factory"
 	"github.com/juju/juju/version"
-	"gopkg.in/juju/names.v2"
 	semversion "github.com/juju/version"
 	corecharm "gopkg.in/juju/charmrepo.v2-unstable"
+	"gopkg.in/juju/names.v2"
 	goyaml "gopkg.in/yaml.v1"
-	"io"
 )
 
 func main() {
@@ -81,7 +81,7 @@
 	command := exec.Command(os.Args[0])
 	command.Env = os.Environ()
 	command.Env = append(
-		command.Env, "ADMIN_PASSWORD="+"pwd") 
+		command.Env, "ADMIN_PASSWORD="+"pwd")
 	defaultSeries := "trusty"
 	command.Env = append(command.Env, "DEFAULT_SERIES="+defaultSeries)
 	stdout, err := command.StdoutPipe()
@@ -175,7 +175,7 @@
 	store := jujuclient.NewFileClientStore()
 	// hard-coded value in juju testing
 	// This will be replaced in JUJU_DATA copy of the juju client config.
-        currentController := "kontroll"
+	currentController := "kontroll"
 	one, err := store.ControllerByName("kontroll")
 	if err != nil {
 		return nil, err

=== modified file 'Makefile'
--- Makefile	2016-07-28 14:44:34 +0000
+++ Makefile	2016-09-15 20:39:05 +0000
@@ -1,11 +1,13 @@
 JUJU1_VERSIONS = 1.24.7 1.25.6
-JUJU2_VERSIONS = 2.0-beta13
+JUJU2_VERSIONS = 2.0-beta17
 VERSIONS = $(JUJU1_VERSIONS) $(JUJU2_VERSIONS)
 GO_VERSION = 1.6
 TARBALLS = $(foreach version,$(VERSIONS),juju-core_$(version).tar.gz)
 BUILT_VERSIONS = $(foreach version,$(VERSIONS),$(version)/$(version))
 JUJU_TARBALL = juju-core_$(JUJU_VERSION).tar.gz
 JUJU_PATCH = patches/juju-core_$(JUJU_VERSION).patch
+JUJUCLIENT_DOWNLOADS = $(shell pwd)/tests/jujuclient-archive
+JUJUCLIENT_REQ = $(JUJUCLIENT_DOWNLOADS)/requirements
 
 .PHONY: build
 build: $(BUILT_VERSIONS)
@@ -22,13 +24,21 @@
 ci-test:
 	sudo apt-get -y install --force-yes \
 		wget \
+		python3-pip \
 		golang-go \
-		python-jujuclient \
 		golang-1.6
+	# See tests/jujuclient-archive/UPGRADE when a newer jujuclient version is needed.
+	sudo python3 -m pip install \
+		--ignore-installed \
+        --no-cache-dir \
+		--no-index \
+		--find-links $(JUJUCLIENT_DOWNLOADS) \
+		--requirement $(JUJUCLIENT_REQ)
 	make test
 
 .PHONY: build-common
 build-common: $(JUJU_TARBALL) $(JUJU_PATCH)
+	rm -rf $(JUJU_VERSION)/src  # Go doesn't play nice with existing files.
 	tar -C $(JUJU_VERSION) --strip=1 -z -xf $(JUJU_TARBALL)
 	patch -p0 < $(JUJU_PATCH)
 	cd $(JUJU_VERSION) && GOPATH=$(shell pwd)/$(JUJU_VERSION) PATH=$(PATH) go build
@@ -60,7 +70,11 @@
 .PHONY: test
 # Use xargs here so that we don't throw away the return codes, and correctly fail if any of the tests fail
 test: $(BUILT_VERSIONS)
-	@echo -n $(VERSIONS) | xargs -t -d' ' -I {} env JUJU_VERSION={} python -m unittest tests.test_fake
+	@echo -n $(VERSIONS) | xargs -t -d' ' -I {} env JUJU_VERSION={} python3 -m unittest tests.test_fake
 
 juju-core_%.tar.gz:
-	wget https://launchpad.net/juju-core/$(shell ((echo $* | grep -q beta) && echo trunk) || (echo $* | cut -f 1,2 -d .))/$*/+download/$@
+	case $* in \
+		1.*) PROJECT="juju-core" ;;\
+		2.*) PROJECT="juju" ;;\
+	esac;\
+	wget https://launchpad.net/$$PROJECT/$(shell (echo $* | cut -f 1 -d - | cut -f 1,2 -d .))/$*/+download/$@

=== renamed file 'patches/juju-core_2.0-beta13.patch' => 'patches/juju-core_2.0-beta17.patch'
--- patches/juju-core_2.0-beta13.patch	2016-07-22 21:27:41 +0000
+++ patches/juju-core_2.0-beta17.patch	2016-09-15 20:39:05 +0000
@@ -1,5 +1,5 @@
---- 2.0-beta13/src/github.com/juju/juju/testcharms/charm.go	2016-03-10 13:45:57.000000000 +0100
-+++ 2.0-beta13/src/github.com/juju/juju/testcharms/charm.go	2016-03-21 10:46:24.312966629 +0100
+--- 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
 @@ -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-beta13/src/github.com/juju/juju/provider/dummy/environs.go	2015-07-06 15:01:14.200568258 +0200
-+++ 2.0-beta13/src/github.com/juju/juju/provider/dummy/environs.go	2015-07-06 15:18:32.648549661 +0200
+--- 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
 @@ -633,9 +633,9 @@
  
  // PrecheckInstance is specified in the state.Prechecker interface.
@@ -26,8 +26,8 @@
  	return nil
  }
  
---- 2.0-beta13/src/github.com/juju/juju/testing/cert.go	2016-03-18 09:25:34 +0000
-+++ 2.0-beta13/src/github.com/juju/juju/testing/cert.go	2016-03-18 09:26:04 +0000
+--- 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
 @@ -52,7 +52,7 @@
  }
  

=== added file 'tests/_jujuclient.py'
--- tests/_jujuclient.py	1970-01-01 00:00:00 +0000
+++ tests/_jujuclient.py	2016-09-15 20:39:05 +0000
@@ -0,0 +1,69 @@
+
+import os.path
+import ssl
+import sys
+
+try:
+    from jujuclient.juju1.environment import Environment as Juju1Client
+    from jujuclient.juju2.environment import Environment as Juju2Client
+except ImportError:
+    sys.exit("latest jujuclient not installed "
+             "(try python3 -m pip install jujuclient)")
+
+
+# XXX No support for cert files in Environment._http_conn, so
+# add it via monkey patching.
+if hasattr(ssl, "_create_unverified_context"):
+    ssl._create_default_https_context = ssl._create_unverified_context
+
+
+ENVIRONMENTS_YAML = """environments:
+    {name}:
+        admin-secret: test
+        default-series: trusty
+        type: {type}
+"""
+
+
+def prepare(name, type, cfgdir, env, version=None):
+
+    if str(version).startswith("1"):
+        environments_yaml = os.path.join(cfgdir, "environments.yaml")
+        with open(environments_yaml, "w") as fd:
+            fd.write(ENVIRONMENTS_YAML.format(**locals()))
+        env["JUJU_HOME"] = cfgdir
+    else:
+        env["JUJU_DATA"] = cfgdir
+
+
+def connect(endpoint, password, uuid, version=None):
+    """Return a connected client to the Juju API endpoint."""
+    JujuClient = Juju2Client
+    midpath = "model"
+    if str(version).startswith("1."):
+        JujuClient = Juju1Client
+        midpath = "environment"
+    endpoint = "/".join(["wss:/", endpoint, midpath, uuid, "api"])
+
+    # TODO make use of the cert
+    # ca_cert = os.path.join(self.juju_home, "cert.ca")
+    client = JujuClient(endpoint)
+    client.login(password)
+    return client
+
+
+class Juju2Client(Juju2Client):
+    """A wrapper around the actual client that fixes busted code.
+
+    This can go away once the following bug(s) are fixed:
+    * https://bugs.launchpad.net/python-jujuclient/+bug/1619479
+    """
+
+    def run_on_all_machines(self, command, timeout=None):
+        """Run the given shell command on all machines in the model."""
+        return self._rpc({
+            "type": self.actions.name,
+            "version": self.actions.version,
+            "request": "RunOnAllMachines",
+            "params": {"commands": command,
+                       "timeout": timeout}})

=== added directory 'tests/jujuclient-archive'
=== added file 'tests/jujuclient-archive/PyYAML-3.12.tar.gz'
Binary files tests/jujuclient-archive/PyYAML-3.12.tar.gz	1970-01-01 00:00:00 +0000 and tests/jujuclient-archive/PyYAML-3.12.tar.gz	2016-09-15 20:39:05 +0000 differ
=== added file 'tests/jujuclient-archive/UPGRADE'
--- tests/jujuclient-archive/UPGRADE	1970-01-01 00:00:00 +0000
+++ tests/jujuclient-archive/UPGRADE	2016-09-15 20:39:05 +0000
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+PACKAGE=jujuclient
+#ARCHIVES_DIR=${PACKAGE}-archive
+ARCHIVES_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+REQ_FILE=$ARCHIVES_DIR/requirements
+VENV_DIR=/tmp/$PACKAGE
+
+set -x
+sudo apt-get install python3-venv
+{ set +x; } 2>/dev/null
+
+echo
+echo Building the requirements file.
+echo '###############################'
+set -x
+rm -r $VENV_DIR &>/dev/null
+python3 -m venv $VENV_DIR
+exclude=$($VENV_DIR/bin/python3 -m pip list | awk '{print $1}' | tr '\n' '|' | sed 's/|$//')
+$VENV_DIR/bin/python3 -m pip install --no-cache-dir $PACKAGE
+$VENV_DIR/bin/python3 -m pip freeze | grep -E -v $exclude > $REQ_FILE
+rm -r $VENV_DIR &>/dev/null
+{ set +x; } 2>/dev/null
+
+echo
+echo Downloading the archives.
+echo '#########################'
+set -x
+python3 -m pip download --dest $ARCHIVES_DIR --requirement $REQ_FILE
+{ set +x; } 2>/dev/null
+
+
+#############################################
+# Uncomment the following to test installing.
+#############################################
+
+#INSTALL=True
+
+if [[ -n $INSTALL ]]; then
+    echo
+    echo Install the pinned packages.
+    echo '############################'
+    set -x
+    sudo python3 -m pip install \
+            --ignore-installed \
+            --no-cache-dir \
+            --no-index \
+            --find-links $ARCHIVES_DIR \
+            --requirement $REQ_FILE
+    { set +x; } 2>/dev/null
+fi

=== added file 'tests/jujuclient-archive/jujuclient-0.53.2.tar.gz'
Binary files tests/jujuclient-archive/jujuclient-0.53.2.tar.gz	1970-01-01 00:00:00 +0000 and tests/jujuclient-archive/jujuclient-0.53.2.tar.gz	2016-09-15 20:39:05 +0000 differ
=== added file 'tests/jujuclient-archive/requirements'
--- tests/jujuclient-archive/requirements	1970-01-01 00:00:00 +0000
+++ tests/jujuclient-archive/requirements	2016-09-15 20:39:05 +0000
@@ -0,0 +1,4 @@
+jujuclient==0.53.2
+PyYAML==3.12
+six==1.10.0
+websocket-client==0.37.0

=== added file 'tests/jujuclient-archive/six-1.10.0-py2.py3-none-any.whl'
Binary files tests/jujuclient-archive/six-1.10.0-py2.py3-none-any.whl	1970-01-01 00:00:00 +0000 and tests/jujuclient-archive/six-1.10.0-py2.py3-none-any.whl	2016-09-15 20:39:05 +0000 differ
=== added file 'tests/jujuclient-archive/websocket_client-0.37.0.tar.gz'
Binary files tests/jujuclient-archive/websocket_client-0.37.0.tar.gz	1970-01-01 00:00:00 +0000 and tests/jujuclient-archive/websocket_client-0.37.0.tar.gz	2016-09-15 20:39:05 +0000 differ
=== modified file 'tests/test_fake.py'
--- tests/test_fake.py	2016-04-01 09:55:10 +0000
+++ tests/test_fake.py	2016-09-15 20:39:05 +0000
@@ -1,14 +1,23 @@
+
+import datetime
+import json
 import os
-import tempfile
+import os.path
 import shutil
 import subprocess
-import json
-import ssl
-
-from jujuclient import Environment
-
-from unittest import TestCase
-from unittest.case import SkipTest
+import tempfile
+import unittest
+import warnings
+
+from . import _jujuclient
+
+
+# Quiet pyflakes on Python 2.
+try:
+    ResourceWarning
+except NameError:
+    ResourceWarning = Warning
+
 
 ROOT_DIR = os.path.dirname(os.path.dirname(__file__))
 
@@ -17,58 +26,62 @@
 
 DUMMY_CHARM = os.path.join(ROOT_DIR, "tests", "charms", "dummy")
 
-ENVIRONMENTS_YAML = """environments:
-    test:
-        admin-secret: test
-        default-series: trusty
-        type: dummy
-"""
-
-# XXX No support for cert files in Environment._http_conn, so
-# add it via monkey patching.
-if hasattr(ssl, "_create_unverified_context"):
-    ssl._create_default_https_context = ssl._create_unverified_context
-
-
-class JujuFakeTest(TestCase):
+
+class _JujuFakeTest:
+
+    # These are set on the child classes.
+    destroycmd = None
+    bootstrap = None
 
     def setUp(self):
-        super(JujuFakeTest, self).setUp()
-        if JUJU_VERSION.startswith("2.0"):
-            raise SkipTest("Juju 2.0 still not fully supported")
-        self.juju_home = tempfile.mkdtemp()
-        environments_yaml = os.path.join(self.juju_home, "environments.yaml")
-        with open(environments_yaml, "w") as fd:
-            fd.write(ENVIRONMENTS_YAML)
+        super(_JujuFakeTest, self).setUp()
+
         self.env = os.environ.copy()
-        self.env["JUJU_HOME"] = self.juju_home
-        self.juju_fake = os.path.join(JUJU_VERSION, JUJU_VERSION)
-        subprocess.check_call([JUJU_FAKE, "bootstrap"], env=self.env)
-        output = subprocess.check_output([JUJU_FAKE, "api-info"], env=self.env)
-        api_info = json.loads(output)
-        endpoint = "wss://" + str(api_info["state-servers"][0]) + "/"
-        # TODO make use of the cert
-        # ca_cert = os.path.join(self.juju_home, "cert.ca")
-        self.environment = Environment(endpoint)
-        self.environment.login("test")
+        self.juju_home = cfgdir = tempfile.mkdtemp()
+        _jujuclient.prepare("dummy", "dummy", cfgdir, self.env, JUJU_VERSION)
+
+        endpoint, uuid, password = self.bootstrap("dummy", "dummy", self.env)
+        self.api = _jujuclient.connect(endpoint, password, uuid, JUJU_VERSION)
 
     def tearDown(self):
-        subprocess.check_call([JUJU_FAKE, "destroy-environment"], env=self.env)
+        subprocess.check_call([JUJU_FAKE, self.destroycmd], env=self.env)
+        self.api.close()
+
         shutil.rmtree(self.juju_home)
-        super(JujuFakeTest, self).tearDown()
+
+        super(_JujuFakeTest, self).tearDown()
+
+
[e-mail](JUJU_VERSION.startswith("1."), "wrong Juju version")
+class Juju1FakeTest(_JujuFakeTest, unittest.TestCase):
+
+    destroycmd = "destroy-environment"
+
+    def bootstrap(self, name, type, env):
+        """Return the API endpoint after bootstrapping the controller."""
+        subprocess.check_call([JUJU_FAKE, "bootstrap", "-e", name], env=env)
+
+        output = subprocess.check_output([JUJU_FAKE, "api-info"], env=env)
+        api_info = json.loads(output.decode())
+        endpoint = str(api_info["state-servers"][0])
+        uuid = api_info["environ-uuid"]
+        password = "test"
+        return endpoint, uuid, password
 
     def test_info(self):
-        info = self.environment.info()
+        info = self.api.info()
         self.assertEqual("dummy", info["ProviderType"])
 
     def test_local_charm(self):
-        charm = self.environment.add_local_charm_dir(DUMMY_CHARM, "trusty")
-        self.environment.deploy("dummy", charm["CharmURL"], num_units=0)
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", ResourceWarning)
+            charm = self.api.add_local_charm_dir(DUMMY_CHARM, "trusty")
+        self.api.deploy("dummy", charm['CharmURL'], num_units=0)
 
     def test_run_on_all_machines(self):
         timeout = 5 * 10 ** 9
-        result = self.environment.run_on_all_machines(
-            "/foo/bar", timeout=timeout)
+        result = self.api.run_on_all_machines("/foo/bar", timeout=timeout)
+
         self.assertEqual(
             {"Results": [
                 {"Code": 0,
@@ -78,3 +91,64 @@
                  "Error": "",
                  "UnitId": ""}]},
             result)
+
+
[e-mail](JUJU_VERSION.startswith("2."), "wrong Juju version")
+class Juju2FakeTest(_JujuFakeTest, unittest.TestCase):
+
+    destroycmd = "destroy-controller"
+
+    def bootstrap(self, name, type, env):
+        """Return the API endpoint after bootstrapping the controller."""
+        args = [JUJU_FAKE, "bootstrap", "--no-gui", name, type]
+        subprocess.check_call(args, env=env)
+
+        args = [JUJU_FAKE, "show-controller", "--format", "json",
+                "--show-password", name]
+        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"]
+        uuid = api_info[name]["models"][model]["uuid"]
+        password = api_info[name]["account"]["password"]
+        return endpoint, uuid, password
+
+    def test_info(self):
+        info = self.api.info()
+        self.assertEqual("dummy", info["provider-type"])
+
+    def test_local_charm(self):
+        with warnings.catch_warnings():
+            warnings.simplefilter("ignore", ResourceWarning)
+            charm = self.api.add_local_charm_dir(DUMMY_CHARM, "trusty")
+        self.api.deploy("dummy", charm['charm-url'], num_units=0)
+
+    def test_run_on_all_machines(self):
+        timeout = 5 * 10 ** 9
+        now = datetime.datetime.utcnow()
+        result = self.api.run_on_all_machines("/foo/bar", timeout=timeout)
+
+        tag = result["results"][0]["action"]["tag"]
+        self.assertTrue(tag.startswith("action-"))
+        self.maxDiff = None
+        enqueuedstr = result["results"][0]["enqueued"]
+        enqueued = datetime.datetime.strptime(
+            enqueuedstr, "%Y-%m-%dT%H:%M:%SZ")
+        self.assertLess(enqueued - now, datetime.timedelta(seconds=1))
+        self.assertEqual(
+            {"results": [
+                {"action": {
+                    "name": "juju-run",
+                    "parameters": {
+                        "command": "/foo/bar",
+                        "timeout": 5000000000,
+                        },
+                    "receiver": "machine-0",
+                    "tag": tag,
+                    },
+                 "completed": "0001-01-01T00:00:00Z",
+                 "enqueued": enqueuedstr,
+                 "started": "0001-01-01T00:00:00Z",
+                 "status": "pending",
+                 }]},
+            result)