-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
We now have a trailing newline and need to match accordingly.
- Loading branch information
Showing
1 changed file
with
4 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1257,10 +1257,12 @@ func (s *cloudinitSuite) TestProxyWritten(c *gc.C) { | |
`export HTTP_PROXY=http://[email protected]`, | ||
`export no_proxy=0.1.2.3,10.0.3.1,localhost`, | ||
`export NO_PROXY=0.1.2.3,10.0.3.1,localhost`, | ||
``, | ||
`(printf '%s\n' 'export http_proxy=http://[email protected] | ||
export HTTP_PROXY=http://[email protected] | ||
export no_proxy=0.1.2.3,10.0.3.1,localhost | ||
export NO_PROXY=0.1.2.3,10.0.3.1,localhost' > /etc/juju-proxy.conf && chmod 0644 /etc/juju-proxy.conf)`, | ||
export NO_PROXY=0.1.2.3,10.0.3.1,localhost | ||
' > /etc/juju-proxy.conf && chmod 0644 /etc/juju-proxy.conf)`, | ||
`printf '%s\n' '# To allow juju to control the global systemd proxy settings, | ||
# create symbolic links to this file from within /etc/systemd/system.conf.d/ | ||
# and /etc/systemd/users.conf.d/. | ||
|
@@ -1271,7 +1273,7 @@ DefaultEnvironment="http_proxy=http://[email protected]" "HTTP_PROXY=http://user@10. | |
found := false | ||
for i, cmd := range cmds { | ||
if cmd == first { | ||
c.Assert(cmds[i+1:i+7], jc.DeepEquals, expected) | ||
c.Assert(cmds[i+1:i+8], jc.DeepEquals, expected) | ||
found = true | ||
break | ||
} | ||
|