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

[Eric Snow]

Fix a couple of broken behaviors for testing.

Without these fixes fake-juju can cause problems in tests.

Fix a couple of broken behaviors for testing.

Without these fixes fake-juju can cause problems in tests.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 59
Branch: lp:~ericsnowcurrently/fake-juju/testing-fixes
Jenkins: https://ci.lscape.net/job/latch-test-xenial/314/

review: Approve (test results)

[Alberto Donato (ack)]

Nice, +1

review: Approve

[Alberto Donato (ack)]

Unrelated, but can we drop 1.24.7?

[Eric Snow (ericsnowcurrently)]

> Unrelated, but can we drop 1.24.7?

+1

I've created lp:1636510 for this work.

[lp:~ericsnowcurrently/fake-juju/testing-fixes]

60. By Eric Snow on 2016-10-25

Merge from parent.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Fail
Revno: 60
Branch: lp:~ericsnowcurrently/fake-juju/testing-fixes
Jenkins: https://ci.lscape.net/job/latch-test-xenial/334/

review: Needs Fixing (test results)

[lp:~ericsnowcurrently/fake-juju/testing-fixes]

61. By Eric Snow on 2016-10-25

Fix a rename.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 61
Branch: lp:~ericsnowcurrently/fake-juju/testing-fixes
Jenkins: https://ci.lscape.net/job/latch-test-xenial/335/

review: Approve (test results)

[lp:~ericsnowcurrently/fake-juju/testing-fixes]

62. By Eric Snow on 2016-10-26

Merge from parent.

[🤖 Landscape Builder (landscape-builder)]

review: Abstain (executing tests)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 62
Branch: lp:~ericsnowcurrently/fake-juju/testing-fixes
Jenkins: https://ci.lscape.net/job/latch-test-xenial/347/

review: Approve (test results)

=== modified file '1.25.6/fake-juju.go'
--- 1.25.6/fake-juju.go	2016-10-26 18:46:45 +0000
+++ 1.25.6/fake-juju.go	2016-10-26 18:46:45 +0000
@@ -77,10 +77,11 @@
 	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()
@@ -93,10 +94,17 @@
 	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
 	}
-	apiInfo := result.apiInfo()
 
 	dialOpts := api.DialOpts{
 		DialAddressInterval: 50 * time.Millisecond,
@@ -141,8 +149,7 @@
 	if err != nil {
 		return err
 	}
-	username := strings.Replace(string(info.Username), "dummy-", "", 1)
-	fmt.Printf("{\"user\": \"%s\", \"password\": \"%s\", \"environ-uuid\": \"%s\", \"state-servers\": [\"%s\"]}\n", username, info.Password, 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
 }
 
@@ -509,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.
@@ -557,6 +563,19 @@
 			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", fifoPath)
 		scanner.Scan()
 
=== modified file '2.0-beta17/fake-juju.go'
--- 2.0-beta17/fake-juju.go	2016-10-26 18:46:45 +0000
+++ 2.0-beta17/fake-juju.go	2016-10-26 18:46:45 +0000
@@ -548,6 +548,19 @@
 			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", fifoPath)
 		scanner.Scan()
 
=== modified file 'python/fakejuju/fakejuju.py'
--- python/fakejuju/fakejuju.py	2016-10-26 18:46:45 +0000
+++ python/fakejuju/fakejuju.py	2016-10-26 18:46:45 +0000
@@ -147,3 +147,7 @@
         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/tests/test_fakejuju.py'
--- python/fakejuju/tests/test_fakejuju.py	2016-10-26 18:46:45 +0000
+++ python/fakejuju/tests/test_fakejuju.py	2016-10-26 18:46:45 +0000
@@ -305,12 +305,8 @@
                 version, bindir, datadir, cfgdir, expected)
             fakejuju = FakeJuju.from_version(version, cfgdir, bindir=bindir)
 
-            # Make the calls.
             cli, api_info = fakejuju.bootstrap("spam", cfgdir, "secret")
-            cli.destroy_controller()
 
-            with open(logfilename) as logfile:
-                calls = [line.strip() for line in logfile]
             files = []
             files.extend(os.path.join(os.path.basename(datadir), name)
                          for name in os.listdir(datadir))
@@ -319,6 +315,10 @@
             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,
@@ -352,6 +352,31 @@
                 },
             })
 
+    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