Merge lp:~gz/juju-core/1.16_comment_tweak into lp:juju-core/1.16

[Martin Packman]

provider/common: Improve testingHTTPServer docs

r=gz

provider/common: Improve testingHTTPServer docs

https://codereview.appspot.com/59800046/

[Martin Packman (gz)]

Self-approving trivial branch, also for landing bot testing.

review: Approve

[Martin Packman (gz)]

Reviewers: mp+205009_code.launchpad.net,

Message:
Please take a look.

Description:
provider/common: Improve testingHTTPServer docs

https://code.launchpad.net/~gz/juju-core/1.16_comment_tweak/+merge/205009

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/59800046/

Affected files (+4, -1 lines):
   A [revision details]
   M provider/common/state_test.go

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-20140131143348-qtnf1xo17li6ngiv
+New revision: <email address hidden>

Index: provider/common/state_test.go
=== modified file 'provider/common/state_test.go'
--- provider/common/state_test.go 2014-01-31 12:30:43 +0000
+++ provider/common/state_test.go 2014-02-05 17:02:38 +0000
@@ -43,7 +43,8 @@
   return
  }

-// testingHTTPServer creates a tempdir backed https server without certs
+// testingHTTPServer creates a tempdir backed https server with internal
+// self-signed certs that will not be accepted as valid.
  func testingHTTPSServer(suite cleaner, c *gc.C) (baseURL string, dataDir
string) {
   dataDir = c.MkDir()
   mux := http.NewServeMux()

[Go Bot (go-bot)]

The attempt to merge lp:~gz/juju-core/1.16_comment_tweak into lp:juju-core/1.16 failed. Below is the output from the failed tests.

flag provided but not defined: -test.timeout
Go is a tool for managing Go source code.

Usage:

 go command [arguments]

The commands are:

    build compile packages and dependencies
    clean remove object files
    doc run godoc on package sources
    env print Go environment information
    fix run go tool fix on packages
    fmt run gofmt on package sources
    get download and install packages and dependencies
    install compile and install packages and dependencies
    list list packages
    run compile and run Go program
    test test packages
    tool run specified go tool
    version print Go version
    vet run go tool vet on packages

Use "go help [command]" for more information about a command.

Additional help topics:

    gopath GOPATH environment variable
    packages description of package lists
    remote remote import path syntax
    testflag description of testing flags
    testfunc description of testing functions

Use "go help [topic]" for more information about that topic.

=== modified file 'provider/common/state_test.go'
--- provider/common/state_test.go	2014-01-31 12:30:43 +0000
+++ provider/common/state_test.go	2014-02-05 17:05:01 +0000
@@ -43,7 +43,8 @@
 	return
 }
 
-// testingHTTPServer creates a tempdir backed https server without certs
+// testingHTTPServer creates a tempdir backed https server with internal
+// self-signed certs that will not be accepted as valid.
 func testingHTTPSServer(suite cleaner, c *gc.C) (baseURL string, dataDir string) {
 	dataDir = c.MkDir()
 	mux := http.NewServeMux()