← Back to branch summary

~james-page/ubuntu/wily/juju-core/mir-fixes

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/environs/testing/tools.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-03-28 08:58:42 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20140328085842-cyzrgc120bdfxwj0
Tags: 1.17.7-0ubuntu1
https://launchpad.net/bugs/1294776
https://launchpad.net/bugs/1297077
* New upstream point release, including fixes for:
  - no debug log with all providers on Ubuntu 14.04 (LP: #1294776).
* d/control: Add cpu-checker dependency to juju-local (LP: #1297077).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/environs/testing/tools.go
5
5
 
6
6
import (
7
7
        "bytes"
8
 
        "net/http"
9
8
        "os"
10
9
        "path"
11
10
        "path/filepath"
22
21
        "launchpad.net/juju-core/state"
23
22
        coretesting "launchpad.net/juju-core/testing"
24
23
        coretools "launchpad.net/juju-core/tools"
 
24
        "launchpad.net/juju-core/utils"
25
25
        "launchpad.net/juju-core/version"
26
26
        "launchpad.net/juju-core/worker/upgrader"
27
27
)
84
84
        c.Assert(err, gc.IsNil)
85
85
        agentTools, err := uploadFakeToolsVersion(stor, vers)
86
86
        c.Assert(err, gc.IsNil)
87
 
        resp, err := http.Get(agentTools.URL)
 
87
        resp, err := utils.GetValidatingHTTPClient().Get(agentTools.URL)
88
88
        c.Assert(err, gc.IsNil)
89
89
        defer resp.Body.Close()
90
90
        err = agenttools.UnpackTools(dataDir, agentTools, resp.Body)