Index: environs/cloudinit/cloudinit_test.go |
=== modified file 'environs/cloudinit/cloudinit_test.go' |
--- environs/cloudinit/cloudinit_test.go 2014-02-12 04:16:46 +0000 |
+++ environs/cloudinit/cloudinit_test.go 2014-02-20 15:03:08 +0000 |
@@ -106,7 +106,7 @@ |
echo 'Fetching tools.* |
bin='/var/lib/juju/tools/1\.2\.3-precise-amd64' |
mkdir -p \$bin |
-wget --no-verbose -O \$bin/tools\.tar\.gz 'http://foo\.com/tools/releases/juju1\.2\.3-precise-amd64\.tgz' |
+curl -o \$bin/tools\.tar\.gz 'http://foo\.com/tools/releases/juju1\.2\.3-precise-amd64\.tgz' |
sha256sum \$bin/tools\.tar\.gz > \$bin/juju1\.2\.3-precise-amd64\.sha256 |
grep '1234' \$bin/juju1\.2\.3-precise-amd64.sha256 \|\| \(echo "Tools checksum mismatch"; exit 1\) |
tar zxf \$bin/tools.tar.gz -C \$bin |
@@ -185,7 +185,7 @@ |
inexactMatch: true, |
expectScripts: ` |
bin='/var/lib/juju/tools/1\.2\.3-raring-amd64' |
-wget --no-verbose -O \$bin/tools\.tar\.gz 'http://foo\.com/tools/releases/juju1\.2\.3-raring-amd64\.tgz' |
+curl -o \$bin/tools\.tar\.gz 'http://foo\.com/tools/releases/juju1\.2\.3-raring-amd64\.tgz' |
sha256sum \$bin/tools\.tar\.gz > \$bin/juju1\.2\.3-raring-amd64\.sha256 |
grep '1234' \$bin/juju1\.2\.3-raring-amd64.sha256 \|\| \(echo "Tools checksum mismatch"; exit 1\) |
rm \$bin/tools\.tar\.gz && rm \$bin/juju1\.2\.3-raring-amd64\.sha256 |
@@ -234,7 +234,7 @@ |
echo 'Fetching tools.* |
bin='/var/lib/juju/tools/1\.2\.3-linux-amd64' |
mkdir -p \$bin |
-wget --no-verbose -O \$bin/tools\.tar\.gz 'http://foo\.com/tools/releases/juju1\.2\.3-linux-amd64\.tgz' |
+curl -o \$bin/tools\.tar\.gz 'http://foo\.com/tools/releases/juju1\.2\.3-linux-amd64\.tgz' |
sha256sum \$bin/tools\.tar\.gz > \$bin/juju1\.2\.3-linux-amd64\.sha256 |
grep '1234' \$bin/juju1\.2\.3-linux-amd64.sha256 \|\| \(echo "Tools checksum mismatch"; exit 1\) |
tar zxf \$bin/tools.tar.gz -C \$bin |
@@ -326,7 +326,7 @@ |
}, |
inexactMatch: true, |
expectScripts: ` |
-wget --no-check-certificate --no-verbose -O \$bin/tools\.tar\.gz 'http://foo\.com/tools/releases/juju1\.2\.3-linux-amd64\.tgz' |
+curl --insecure -o \$bin/tools\.tar\.gz 'http://foo\.com/tools/releases/juju1\.2\.3-linux-amd64\.tgz' |
`, |
}, { |
// empty contraints. |