Left: | ||
Right: |
OLD | NEW |
---|---|
1 package environs_test | 1 package environs_test |
2 | 2 |
3 import ( | 3 import ( |
4 "bytes" | 4 "bytes" |
5 "fmt" | 5 "fmt" |
6 "io/ioutil" | 6 "io/ioutil" |
7 . "launchpad.net/gocheck" | 7 . "launchpad.net/gocheck" |
8 "launchpad.net/juju-core/environs" | 8 "launchpad.net/juju-core/environs" |
9 "launchpad.net/juju-core/environs/dummy" | 9 "launchpad.net/juju-core/environs/dummy" |
10 "launchpad.net/juju-core/state" | 10 "launchpad.net/juju-core/state" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
53 } | 53 } |
54 | 54 |
55 var _ = Suite(&ToolsSuite{}) | 55 var _ = Suite(&ToolsSuite{}) |
56 | 56 |
57 const urlFile = "downloaded-url.txt" | 57 const urlFile = "downloaded-url.txt" |
58 | 58 |
59 var commandTests = []struct { | 59 var commandTests = []struct { |
60 cmd []string | 60 cmd []string |
61 output string | 61 output string |
62 }{ | 62 }{ |
63 // TODO(niemeyer): Reintroduce this once we start deploying to the publi c bucket. | |
dfc
2012/09/26 02:15:00
Why would we ever way to push the client tool into
niemeyer
2012/09/26 02:33:24
It seems like a good idea to have available the cl
| |
64 //{ | |
65 // []string{"juju", "arble"}, | |
66 // "error: unrecognized command: juju arble\n", | |
67 //}, | |
63 { | 68 { |
64 []string{"juju", "arble"}, | |
65 "error: unrecognized command: juju arble\n", | |
66 }, { | |
67 []string{"jujud", "arble"}, | 69 []string{"jujud", "arble"}, |
68 "error: unrecognized command: jujud arble\n", | 70 "error: unrecognized command: jujud arble\n", |
69 }, { | 71 }, { |
70 []string{"jujuc"}, | 72 []string{"jujuc"}, |
71 "(.|\n)*error: jujuc should not be called directly\n", | 73 "(.|\n)*error: jujuc should not be called directly\n", |
72 }, | 74 }, |
73 } | 75 } |
74 | 76 |
75 func (t *ToolsSuite) TestPutGetTools(c *C) { | 77 func (t *ToolsSuite) TestPutGetTools(c *C) { |
76 tools, err := environs.PutTools(t.env.Storage(), nil) | 78 tools, err := environs.PutTools(t.env.Storage(), nil) |
(...skipping 692 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
769 tools := environs.BestTools(t.list, t.vers, environs.CompatVersi on) | 771 tools := environs.BestTools(t.list, t.vers, environs.CompatVersi on) |
770 c.Assert(tools, DeepEquals, t.expect) | 772 c.Assert(tools, DeepEquals, t.expect) |
771 tools = environs.BestTools(t.list, t.vers, environs.DevVersion|e nvirons.CompatVersion) | 773 tools = environs.BestTools(t.list, t.vers, environs.DevVersion|e nvirons.CompatVersion) |
772 c.Assert(tools, DeepEquals, t.expectDev) | 774 c.Assert(tools, DeepEquals, t.expectDev) |
773 tools = environs.BestTools(t.list, t.vers, environs.HighestVersi on|environs.CompatVersion) | 775 tools = environs.BestTools(t.list, t.vers, environs.HighestVersi on|environs.CompatVersion) |
774 c.Assert(tools, DeepEquals, t.expectHighest) | 776 c.Assert(tools, DeepEquals, t.expectHighest) |
775 tools = environs.BestTools(t.list, t.vers, environs.DevVersion|e nvirons.HighestVersion|environs.CompatVersion) | 777 tools = environs.BestTools(t.list, t.vers, environs.DevVersion|e nvirons.HighestVersion|environs.CompatVersion) |
776 c.Assert(tools, DeepEquals, t.expectDevHighest) | 778 c.Assert(tools, DeepEquals, t.expectDevHighest) |
777 } | 779 } |
778 } | 780 } |
OLD | NEW |