Merge lp:~chipaca/ubuntu-push/fixed-borked-pem-checks into lp:ubuntu-push

[John Lenton]

oops, i borked the pem check tests. Fixed.

I broke the tests that checked configure against broken PEMs... fixed
them (and made them more resilient).

[Samuele Pedroni (pedronis)]

review: Approve

=== modified file 'client/client_test.go'
--- client/client_test.go	2014-02-06 13:11:32 +0000
+++ client/client_test.go	2014-02-08 18:23:21 +0000
@@ -175,12 +175,13 @@
     "connectivity_check_md5": "",
     "addr": ":0",
     "cert_pem_file": "/a/b/c",
+    "log_level": "debug",
     "recheck_timeout": "3h"
 }`), 0600)
 
 	cli := new(Client)
 	err := cli.configure(cs.configPath)
-	c.Assert(err, NotNil)
+	c.Assert(err, ErrorMatches, "reading PEM file: .*")
 }
 
 func (cs *clientSuite) TestConfigureBailsOnBadPEM(c *C) {
@@ -192,12 +193,13 @@
     "connectivity_check_md5": "",
     "addr": ":0",
     "cert_pem_file": "/etc/passwd",
+    "log_level": "debug",
     "recheck_timeout": "3h"
 }`), 0600)
 
 	cli := new(Client)
 	err := cli.configure(cs.configPath)
-	c.Assert(err, NotNil)
+	c.Assert(err, ErrorMatches, "no PEM found.*")
 }
 
 /*****************************************************************