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

Delta Between Two Patch Sets: cmd/juju/ssh_test.go

Issue 97230043: cmd/juju: check use-proxy before resolving address
Left Patch Set: Created 9 years, 10 months ago
Right Patch Set: cmd/juju: check use-proxy before resolving address Created 9 years, 10 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « cmd/juju/ssh.go ('k') | no next file » | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 // Copyright 2012, 2013 Canonical Ltd. 1 // Copyright 2012, 2013 Canonical Ltd.
2 // Licensed under the AGPLv3, see LICENCE file for details. 2 // Licensed under the AGPLv3, see LICENCE file for details.
3 3
4 package main 4 package main
5 5
6 import ( 6 import (
7 "bytes" 7 "bytes"
8 "fmt" 8 "fmt"
9 "net/url" 9 "net/url"
10 "os" 10 "os"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 ) 61 )
62 62
63 var sshTests = []struct { 63 var sshTests = []struct {
64 about string 64 about string
65 args []string 65 args []string
66 result string 66 result string
67 }{ 67 }{
68 { 68 {
69 "connect to machine 0", 69 "connect to machine 0",
70 []string{"ssh", "0"}, 70 []string{"ssh", "0"},
71 » » sshArgs + "ubuntu@dummyenv-0.dns\n", 71 » » sshArgs + "ubuntu@dummyenv-0.internal\n",
72 }, 72 },
73 { 73 {
74 "connect to machine 0 and pass extra arguments", 74 "connect to machine 0 and pass extra arguments",
75 []string{"ssh", "0", "uname", "-a"}, 75 []string{"ssh", "0", "uname", "-a"},
76 » » sshArgs + "ubuntu@dummyenv-0.dns uname -a\n", 76 » » sshArgs + "ubuntu@dummyenv-0.internal uname -a\n",
77 }, 77 },
78 { 78 {
79 "connect to unit mysql/0", 79 "connect to unit mysql/0",
80 []string{"ssh", "mysql/0"}, 80 []string{"ssh", "mysql/0"},
81 » » sshArgs + "ubuntu@dummyenv-0.dns\n", 81 » » sshArgs + "ubuntu@dummyenv-0.internal\n",
82 }, 82 },
83 { 83 {
84 "connect to unit mongodb/1 and pass extra arguments", 84 "connect to unit mongodb/1 and pass extra arguments",
85 []string{"ssh", "mongodb/1", "ls", "/"}, 85 []string{"ssh", "mongodb/1", "ls", "/"},
86 » » sshArgs + "ubuntu@dummyenv-2.dns ls /\n", 86 » » sshArgs + "ubuntu@dummyenv-2.internal ls /\n",
87 }, 87 },
88 { 88 {
89 "connect to unit mysql/0 without proxy", 89 "connect to unit mysql/0 without proxy",
90 []string{"ssh", "--proxy=false", "mysql/0"}, 90 []string{"ssh", "--proxy=false", "mysql/0"},
91 sshArgsNoProxy + "ubuntu@dummyenv-0.dns\n", 91 sshArgsNoProxy + "ubuntu@dummyenv-0.dns\n",
92 }, 92 },
93 } 93 }
94 94
95 func (s *SSHSuite) TestSSHCommand(c *gc.C) { 95 func (s *SSHSuite) TestSSHCommand(c *gc.C) {
96 m := s.makeMachines(3, c, true) 96 m := s.makeMachines(3, c, true)
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 machines[i] = m 213 machines[i] = m
214 } 214 }
215 return machines 215 return machines
216 } 216 }
217 217
218 func (s *SSHCommonSuite) addUnit(srv *state.Service, m *state.Machine, c *gc.C) { 218 func (s *SSHCommonSuite) addUnit(srv *state.Service, m *state.Machine, c *gc.C) {
219 u, err := srv.AddUnit() 219 u, err := srv.AddUnit()
220 c.Assert(err, gc.IsNil) 220 c.Assert(err, gc.IsNil)
221 err = u.AssignToMachine(m) 221 err = u.AssignToMachine(m)
222 c.Assert(err, gc.IsNil) 222 c.Assert(err, gc.IsNil)
223 » // fudge unit.SetPublicAddress 223 }
224 » id, err := m.InstanceId()
225 » c.Assert(err, gc.IsNil)
226 » insts, err := s.Conn.Environ.Instances([]instance.Id{id})
227 » c.Assert(err, gc.IsNil)
228 » addr, err := insts[0].WaitDNSName()
229 » c.Assert(err, gc.IsNil)
230 » err = m.SetAddresses(instance.NewAddress(addr, instance.NetworkPublic))
231 » c.Assert(err, gc.IsNil)
232 }
LEFTRIGHT

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