Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(681)

Unified Diff: environs/cloudinit/cloudinit_test.go

Issue 11561044: Make agent/tools and remove state.Tools
Patch Set: Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: environs/cloudinit/cloudinit_test.go
=== modified file 'environs/cloudinit/cloudinit_test.go'
--- environs/cloudinit/cloudinit_test.go 2013-07-19 17:12:37 +0000
+++ environs/cloudinit/cloudinit_test.go 2013-07-22 04:23:33 +0000
@@ -5,8 +5,13 @@
import (
"encoding/base64"
+ "regexp"
+ "strings"
+
. "launchpad.net/gocheck"
"launchpad.net/goyaml"
+
+ "launchpad.net/juju-core/agent/tools"
coreCloudinit "launchpad.net/juju-core/cloudinit"
"launchpad.net/juju-core/constraints"
"launchpad.net/juju-core/environs"
@@ -16,8 +21,6 @@
"launchpad.net/juju-core/state/api"
"launchpad.net/juju-core/testing"
"launchpad.net/juju-core/version"
- "regexp"
- "strings"
)
// Use local suite since this file lives in the ec2 package
@@ -250,8 +253,8 @@
},
}
-func newSimpleTools(vers string) *state.Tools {
- return &state.Tools{
+func newSimpleTools(vers string) *tools.Tools {
+ return &tools.Tools{
URL: "http://foo.com/tools/juju" + vers + ".tgz",
Binary: version.MustParseBinary(vers),
}
@@ -503,7 +506,7 @@
cfg.Tools = nil
}},
{"missing tools URL", func(cfg *cloudinit.MachineConfig) {
- cfg.Tools = &state.Tools{}
+ cfg.Tools = &tools.Tools{}
}},
{"entity tag must match started machine", func(cfg *cloudinit.MachineConfig) {
cfg.StateServer = false

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b