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

Unified Diff: cmd/juju/ssh_test.go

Issue 97230043: cmd/juju: check use-proxy before resolving address
Patch Set: cmd/juju: check use-proxy before resolving address Created 9 years, 10 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
« no previous file with comments | « cmd/juju/ssh.go ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cmd/juju/ssh_test.go
=== modified file 'cmd/juju/ssh_test.go'
--- cmd/juju/ssh_test.go 2014-04-07 00:36:36 +0000
+++ cmd/juju/ssh_test.go 2014-05-09 07:41:52 +0000
@@ -68,22 +68,22 @@
{
"connect to machine 0",
[]string{"ssh", "0"},
- sshArgs + "ubuntu@dummyenv-0.dns\n",
+ sshArgs + "ubuntu@dummyenv-0.internal\n",
},
{
"connect to machine 0 and pass extra arguments",
[]string{"ssh", "0", "uname", "-a"},
- sshArgs + "ubuntu@dummyenv-0.dns uname -a\n",
+ sshArgs + "ubuntu@dummyenv-0.internal uname -a\n",
},
{
"connect to unit mysql/0",
[]string{"ssh", "mysql/0"},
- sshArgs + "ubuntu@dummyenv-0.dns\n",
+ sshArgs + "ubuntu@dummyenv-0.internal\n",
},
{
"connect to unit mongodb/1 and pass extra arguments",
[]string{"ssh", "mongodb/1", "ls", "/"},
- sshArgs + "ubuntu@dummyenv-2.dns ls /\n",
+ sshArgs + "ubuntu@dummyenv-2.internal ls /\n",
},
{
"connect to unit mysql/0 without proxy",
@@ -182,7 +182,7 @@
attemptStarter.next = func() bool {
called++
if called > 1 {
- s.setAddress(m[0], c)
+ s.setAddresses(m[0], c)
}
return true
}
@@ -191,19 +191,20 @@
c.Assert(called, gc.Equals, 2)
}
-func (s *SSHCommonSuite) setAddress(m *state.Machine, c *gc.C) {
- addr := instance.NewAddress(fmt.Sprintf("dummyenv-%s.dns", m.Id()), instance.NetworkPublic)
- err := m.SetAddresses(addr)
+func (s *SSHCommonSuite) setAddresses(m *state.Machine, c *gc.C) {
+ addrPub := instance.NewAddress(fmt.Sprintf("dummyenv-%s.dns", m.Id()), instance.NetworkPublic)
+ addrPriv := instance.NewAddress(fmt.Sprintf("dummyenv-%s.internal", m.Id()), instance.NetworkCloudLocal)
+ err := m.SetAddresses(addrPub, addrPriv)
c.Assert(err, gc.IsNil)
}
-func (s *SSHCommonSuite) makeMachines(n int, c *gc.C, setAddress bool) []*state.Machine {
+func (s *SSHCommonSuite) makeMachines(n int, c *gc.C, setAddresses bool) []*state.Machine {
var machines = make([]*state.Machine, n)
for i := 0; i < n; i++ {
m, err := s.State.AddMachine("quantal", state.JobHostUnits)
c.Assert(err, gc.IsNil)
- if setAddress {
- s.setAddress(m, c)
+ if setAddresses {
+ s.setAddresses(m, c)
}
// must set an instance id as the ssh command uses that as a signal the
// machine has been provisioned
@@ -219,13 +220,4 @@
c.Assert(err, gc.IsNil)
err = u.AssignToMachine(m)
c.Assert(err, gc.IsNil)
- // fudge unit.SetPublicAddress
- id, err := m.InstanceId()
- c.Assert(err, gc.IsNil)
- insts, err := s.Conn.Environ.Instances([]instance.Id{id})
- c.Assert(err, gc.IsNil)
- addr, err := insts[0].WaitDNSName()
- c.Assert(err, gc.IsNil)
- err = m.SetAddresses(instance.NewAddress(addr, instance.NetworkPublic))
- c.Assert(err, gc.IsNil)
}
« no previous file with comments | « cmd/juju/ssh.go ('k') | no next file » | no next file with comments »

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