diff --git a/test/integration/driver-amazonec2.bats b/test/integration/driver-amazonec2.bats index 4568981028..ccddb7f3b9 100644 --- a/test/integration/driver-amazonec2.bats +++ b/test/integration/driver-amazonec2.bats @@ -7,7 +7,7 @@ export NAME="bats-$DRIVER-test" export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } @@ -16,11 +16,6 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER [ "$status" -eq 0 ] } -@test "$DRIVER: active" { - run machine active $NAME - [ "$status" -eq 0 ] -} - @test "$DRIVER: ls" { run machine ls [ "$status" -eq 0 ] @@ -151,7 +146,7 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } diff --git a/test/integration/driver-azure.bats b/test/integration/driver-azure.bats index cdebb8683b..1aa79ea5cb 100644 --- a/test/integration/driver-azure.bats +++ b/test/integration/driver-azure.bats @@ -7,7 +7,7 @@ export NAME="bats-$DRIVER-test" export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } @@ -16,11 +16,6 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER [ "$status" -eq 0 ] } -@test "$DRIVER: active" { - run machine active $NAME - [ "$status" -eq 0 ] -} - @test "$DRIVER: ls" { run machine ls [ "$status" -eq 0 ] @@ -98,7 +93,7 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER } @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } diff --git a/test/integration/driver-digitalocean.bats b/test/integration/driver-digitalocean.bats index c13d3fa572..5de5fc421c 100644 --- a/test/integration/driver-digitalocean.bats +++ b/test/integration/driver-digitalocean.bats @@ -7,7 +7,7 @@ export NAME="bats-$DRIVER-test" export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } @@ -16,11 +16,6 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER [ "$status" -eq 0 ] } -@test "$DRIVER: active" { - run machine active $NAME - [ "$status" -eq 0 ] -} - @test "$DRIVER: ls" { run machine ls [ "$status" -eq 0 ] @@ -158,7 +153,7 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } diff --git a/test/integration/driver-exoscale.bats b/test/integration/driver-exoscale.bats index e6c0accabf..378b93eb64 100644 --- a/test/integration/driver-exoscale.bats +++ b/test/integration/driver-exoscale.bats @@ -7,7 +7,7 @@ export NAME="bats-$DRIVER-test" export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } @@ -16,11 +16,6 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER [ "$status" -eq 0 ] } -@test "$DRIVER: active" { - run machine active $NAME - [ "$status" -eq 0 ] -} - @test "$DRIVER: ls" { run machine ls [ "$status" -eq 0 ] @@ -103,7 +98,7 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER } @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } diff --git a/test/integration/driver-google.bats b/test/integration/driver-google.bats index 6dc6482bd4..bbf2db278e 100644 --- a/test/integration/driver-google.bats +++ b/test/integration/driver-google.bats @@ -7,7 +7,7 @@ export NAME="bats-$DRIVER-test" export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } @@ -16,11 +16,6 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER [ "$status" -eq 0 ] } -@test "$DRIVER: active" { - run machine active $NAME - [ "$status" -eq 0 ] -} - @test "$DRIVER: ls" { run machine ls [ "$status" -eq 0 ] @@ -98,7 +93,7 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER } @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } diff --git a/test/integration/driver-hyperv.bats b/test/integration/driver-hyperv.bats index f751a83032..763e9d30d1 100644 --- a/test/integration/driver-hyperv.bats +++ b/test/integration/driver-hyperv.bats @@ -7,7 +7,7 @@ export NAME="bats-$DRIVER-test" export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } @@ -16,11 +16,6 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER [ "$status" -eq 0 ] } -@test "$DRIVER: active" { - run machine active $NAME - [ "$status" -eq 0 ] -} - @test "$DRIVER: ls" { run machine ls [ "$status" -eq 0 ] @@ -98,7 +93,7 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER } @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } diff --git a/test/integration/driver-rackspace.bats b/test/integration/driver-rackspace.bats index 46ec719ed5..b96f59dece 100644 --- a/test/integration/driver-rackspace.bats +++ b/test/integration/driver-rackspace.bats @@ -7,7 +7,7 @@ export NAME="bats-$DRIVER-test" export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } @@ -16,11 +16,6 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER [ "$status" -eq 0 ] } -@test "$DRIVER: active" { - run machine active $NAME - [ "$status" -eq 0 ] -} - @test "$DRIVER: ls" { run machine ls [ "$status" -eq 0 ] @@ -76,7 +71,7 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER } @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } diff --git a/test/integration/driver-softlayer.bats b/test/integration/driver-softlayer.bats index 6c93ee4d0b..b4be9c908c 100644 --- a/test/integration/driver-softlayer.bats +++ b/test/integration/driver-softlayer.bats @@ -7,7 +7,7 @@ export NAME="bats-$DRIVER-test" export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } @@ -16,11 +16,6 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER [ "$status" -eq 0 ] } -@test "$DRIVER: active" { - run machine active $NAME - [ "$status" -eq 0 ] -} - @test "$DRIVER: ls" { run machine ls [ "$status" -eq 0 ] @@ -98,7 +93,7 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER } @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } diff --git a/test/integration/driver-virtualbox.bats b/test/integration/driver-virtualbox.bats index 9ff700d329..7319460321 100644 --- a/test/integration/driver-virtualbox.bats +++ b/test/integration/driver-virtualbox.bats @@ -43,7 +43,7 @@ buildMachineWithOldIsoCheckUpgrade() { } @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } @@ -57,11 +57,6 @@ buildMachineWithOldIsoCheckUpgrade() { [ "$status" -eq 0 ] } -@test "$DRIVER: active" { - run machine active $NAME - [ "$status" -eq 0 ] -} - @test "$DRIVER: check default machine memory size" { findMemorySize [[ ${output} == "${DEFAULT_MEMSIZE}" ]] @@ -203,7 +198,7 @@ buildMachineWithOldIsoCheckUpgrade() { } @test "$DRIVER: machine should not exist after remove" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } diff --git a/test/integration/driver-vmwarefusion.bats b/test/integration/driver-vmwarefusion.bats index dbca7cf08b..5e5f4e2092 100644 --- a/test/integration/driver-vmwarefusion.bats +++ b/test/integration/driver-vmwarefusion.bats @@ -12,7 +12,7 @@ function setup() { } @test "$DRIVER: docker-machine should not exist" { - run docker-machine active $NAME + run docker-machine inspect $NAME [ "$status" -eq 1 ] } @@ -21,11 +21,6 @@ function setup() { [ "$status" -eq 0 ] } -@test "$DRIVER: active" { - run docker-machine active $NAME - [ "$status" -eq 0 ] -} - @test "$DRIVER: ls" { run docker-machine ls [ "$status" -eq 0 ] @@ -103,7 +98,7 @@ function setup() { } @test "$DRIVER: docker-machine should not exist" { - run docker-machine active $NAME + run docker-machine inspect $NAME [ "$status" -eq 1 ] } diff --git a/test/integration/driver-vmwarevcloudair.bats b/test/integration/driver-vmwarevcloudair.bats index c21cff7569..07883969ad 100644 --- a/test/integration/driver-vmwarevcloudair.bats +++ b/test/integration/driver-vmwarevcloudair.bats @@ -7,7 +7,7 @@ export NAME="bats-$DRIVER-test" export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] } @@ -16,11 +16,6 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER [ "$status" -eq 0 ] } -@test "$DRIVER: active" { - run machine active $NAME - [ "$status" -eq 0 ] -} - @test "$DRIVER: ls" { run machine ls [ "$status" -eq 0 ] @@ -98,7 +93,7 @@ export MACHINE_STORAGE_PATH=/tmp/machine-bats-test-$DRIVER } @test "$DRIVER: machine should not exist" { - run machine active $NAME + run machine inspect $NAME [ "$status" -eq 1 ] }