Merge pull request #1377 from nathanleclaire/integration_rm_rm

Make some clean ups and fixes to the integration tests

test/integration/core/supported-engine-options.bats

@@ -5,7 +5,7 @@ load ${BASE_TEST_DIR}/helpers.bash
 @test "$DRIVER: create with supported engine options" {
   run machine create -d $DRIVER \
     --engine-label spam=eggs \
-    --engine-storage-driver devicemapper \
+    --engine-storage-driver overlay \
     --engine-insecure-registry registry.myco.com \
     $NAME
   echo "$output"
@@ -19,15 +19,5 @@ load ${BASE_TEST_DIR}/helpers.bash
 
 @test "$DRIVER: check for engine storage driver" {
   storage_driver_info=$(docker $(machine config $NAME) info | grep "Storage Driver")
-  [[ $storage_driver_info =~ "devicemapper" ]]
-}
-
-@test "$DRIVER: rm after supported engine option create" {
-  run machine rm $NAME
-  [ $status -eq 0 ]
-}
-
-@test "$DRIVER: machine should not exist" {
-  run machine inspect $NAME
-  [ "$status" -eq 1  ]
+  [[ $storage_driver_info =~ "overlay" ]]
 }

test/integration/core/swarm-options.bats

@@ -25,12 +25,3 @@ export TOKEN=$(curl -sS -X POST "https://discovery-stage.hub.docker.com/v1/clust
     echo ${heartbeat_arg}
     [[ "$heartbeat_arg" == "--heartbeat=5" ]]
 }
-
-@test "clean up created nodes" {
-    run machine rm queenbee workerbee
-    [[ "$status" -eq 0 ]]
-}
-
-@test "remove dir" {
-    rm -rf $MACHINE_STORAGE_PATH
-}