From 0ef369106961d3420f2d0e7f1834c62a3c57c3bc Mon Sep 17 00:00:00 2001
From: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
Date: Mon, 11 Jan 2016 15:21:24 +0100
Subject: [PATCH] Fix ec2 ebs optimized integration test

Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
---
 .../amazonec2/create-ebsinstance.bats         | 37 ++++++++-----------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/test/integration/amazonec2/create-ebsinstance.bats b/test/integration/amazonec2/create-ebsinstance.bats
index 60ccbcda20..2b2661bc54 100644
--- a/test/integration/amazonec2/create-ebsinstance.bats
+++ b/test/integration/amazonec2/create-ebsinstance.bats
@@ -2,31 +2,26 @@
 
 load ${BASE_TEST_DIR}/helpers.bash
 
-force_env DRIVER amazonec2
+only_if_env DRIVER amazonec2
 
-#Use Instance Type that supports EBS Optimize 
-export AWS_INSTANCE_TYPE=m4.large
+use_disposable_machine
 
-only_if_env AWS_DEFAULT_REGION
-
-only_if_env AWS_ACCESS_KEY_ID
-
-only_if_env AWS_SECRET_ACCESS_KEY
-
-only_if_env AWS_SUBNET_ID
+require_env AWS_ACCESS_KEY_ID
+require_env AWS_SECRET_ACCESS_KEY
+require_env AWS_VPC_ID
 
+require_env AWS_DEFAULT_REGION
+require_env AWS_ZONE
 
 @test "$DRIVER: Should Create an EBS Optimized Instance" {
-  
-  machine create -d amazonec2 --amazonec2-use-ebs-optimized-instance $NAME
-
-  run docker $(machine config $NAME) run --rm -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY -e AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION blendle/aws-cli ec2 describe-instances --filters Name=tag:Name,Values=$NAME Name=instance-state-name,Values=running --query 'Reservations[0].Instances[0].EbsOptimized' --output text	
+    #Use Instance Type that supports EBS Optimize
+    run machine create -d amazonec2 --amazonec2-instance-type=m4.large --amazonec2-use-ebs-optimized-instance $NAME
+    echo ${output}
+    [ "$status" -eq 0 ]
+}
 
+@test "$DRIVER: Check the machine is up" {
+    run docker $(machine config $NAME) run --rm -e AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY -e AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION -e AWS_ZONE=$AWS_ZONE -e AWS_VPC_ID=$AWS_VPC_ID blendle/aws-cli ec2 describe-instances --filters Name=tag:Name,Values=$NAME Name=instance-state-name,Values=running --query 'Reservations[0].Instances[0].EbsOptimized' --output text
+    echo ${output}
     [[ ${lines[*]:-1} =~ "True" ]]
-
- }
-
-
-
- 
- 
\ No newline at end of file
+}
\ No newline at end of file