Merge lp:~benji/landscape-charm/small-tweaks-for-openssl-and-makefile into lp:~landscape/landscape-charm/trunk

[Benji York]

- simpler invocation of openssl for grabbing server certs with a comment
  to explain what is happending
- some added nicities for the Makefile.

This branch makes two sets of tweaks: simpler invocation of openssl for
grabbing server certs with a comment to explain what is happending and
some added nicities for the Makefile.

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 324
Branch: lp:~benji/landscape-charm/small-tweaks-for-openssl-and-makefile
Jenkins: https://ci.lscape.net/job/latch-test/1702/

review: Approve (test results)

[Chris Glass (tribaal)]

Great, thanks a lot! +1

review: Approve

[Adam Collard (adam-collard)]

Minor comment inline. +1

review: Approve

[lp:~benji/landscape-charm/small-tweaks-for-openssl-and-makefile]

325. By Benji York on 2015-07-09

open /dev/null in update mode (plus replace beautiful single-quotes with abhorrent double-quotes)

[🤖 Landscape Builder (landscape-builder)]

Command: make ci-test
Result: Success
Revno: 325
Branch: lp:~benji/landscape-charm/small-tweaks-for-openssl-and-makefile
Jenkins: https://ci.lscape.net/job/latch-test/1706/

review: Approve (test results)

[Benji York (benji)]

Thanks for the reviews.

=== modified file 'Makefile'
--- Makefile	2015-06-11 19:42:28 +0000
+++ Makefile	2015-07-09 16:30:28 +0000
@@ -16,7 +16,7 @@
 		exit 1;\
 	else \
 		echo "installed"; \
-	fi 
+	fi
 
 update-charm-revision-numbers: bundles
 	@dev/update-charm-revision-numbers \
@@ -61,7 +61,7 @@
 	flake8 lib tests
 	pyflakes3 tests dev/update-charm-revision-numbers
 	find . -name *.py -not -path "./old/*" -not -path "*/charmhelpers/*" -print0 | xargs -0 flake8
-	flake8 tests dev/update-charm-revision-numbers 
+	flake8 tests dev/update-charm-revision-numbers
 
 clean:
 	@rm -rf bundles
@@ -81,7 +81,11 @@
 dev/charm_helpers_sync.py:
 	@mkdir -p dev
 	@bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
-        > dev/charm_helpers_sync.py
+            > dev/charm_helpers_sync.py
 
 sync: dev/charm_helpers_sync.py
 	$(PYTHON) dev/charm_helpers_sync.py -c charm-helpers.yaml
+
+build: secrets test-depends
+
+.DEFAULT_GOAL := build

=== modified file 'tests/helpers.py'
--- tests/helpers.py	2015-07-09 14:47:01 +0000
+++ tests/helpers.py	2015-07-09 16:30:28 +0000
@@ -574,18 +574,14 @@
 
     @param endpoint: An SSL endpoint in the form <host:port>.
     """
-    # Call openssl s_client connect to get the actual certificate served.
-    # The command line program is a bit archaic and therefore we need
-    # to do a few things like send it a user "return"), and
-    # filter some of the output (it print non-error messages on stderr).
-    process = subprocess.Popen(('echo', '-n'), stdout=subprocess.PIPE)
-    with open(os.devnull, 'w') as dev_null:
+    # Call openssl to get the actual certificate served.  The s_client command
+    # outputs the server certificate, but expects a request body, which we
+    # don't have, so we just pipe in /dev/null to generate an empty request.
+    # The server is likely to generate an error response. <shrug>
+    with open(os.devnull, "r+") as dev_null:
         output = subprocess.check_output(  # output is bytes
-            ['openssl', 's_client', '-connect', endpoint],
-            stdin=process.stdout, stderr=dev_null)
-    process.stdout.close()  # Close the pipe fd
-    process.wait()  # This closes the subprocess sending the return.
-
+            ["openssl", "s_client", "-connect", endpoint],
+            stdin=dev_null, stderr=dev_null)
     certificate = output.decode("utf-8")
     start = certificate.find("-----BEGIN CERTIFICATE-----")
     end = certificate.find("-----END CERTIFICATE-----") + len(