From 690215b7eca5490b979de9d69082bb388226cfe5 Mon Sep 17 00:00:00 2001 From: Jean-Laurent de Morlhon Date: Fri, 20 Nov 2015 18:31:25 +0100 Subject: [PATCH 1/4] move vbox test to core Signed-off-by: Jean-Laurent de Morlhon --- .../drivers/virtualbox/pause-and-save.bats | 89 ------------------- .../virtualbox/bad-create-iso.bats | 4 +- .../virtualbox/certs-checksum.bats | 4 +- .../virtualbox/custom-mem-disk.bats | 4 +- .../virtualbox/pause-save-start.bats | 57 ++++++++++++ .../{drivers => }/virtualbox/upgrade.bats | 4 +- 6 files changed, 69 insertions(+), 93 deletions(-) delete mode 100644 test/integration/drivers/virtualbox/pause-and-save.bats rename test/integration/{drivers => }/virtualbox/bad-create-iso.bats (83%) rename test/integration/{drivers => }/virtualbox/certs-checksum.bats (94%) rename test/integration/{drivers => }/virtualbox/custom-mem-disk.bats (96%) create mode 100644 test/integration/virtualbox/pause-save-start.bats rename test/integration/{drivers => }/virtualbox/upgrade.bats (93%) diff --git a/test/integration/drivers/virtualbox/pause-and-save.bats b/test/integration/drivers/virtualbox/pause-and-save.bats deleted file mode 100644 index a41a505a..00000000 --- a/test/integration/drivers/virtualbox/pause-and-save.bats +++ /dev/null @@ -1,89 +0,0 @@ -#!/usr/bin/env bats - -load ${BASE_TEST_DIR}/helpers.bash - -## THIS IS VIRTUALBOX ONLY - -force_env DRIVER virtualbox - -@test "$DRIVER: create a new virtualbox machine" { - run machine create -d $DRIVER $NAME - echo ${output} - [ "$status" -eq 0 ] -} - -@test "$DRIVER: pause the newly created machine" { - run vboxmanage controlvm $NAME pause - echo ${output} - [ "$status" -eq 0 ] -} - -@test "$DRIVER: status should show paused after pause" { - run machine status $NAME - echo ${output} - [ "$status" -eq 0 ] - [[ ${output} == *"Paused"* ]] -} - -@test "$DRIVER: should stop a paused machine" { - run machine stop $NAME - echo ${output} - [ "$status" -eq 0 ] -} - -@test "$DRIVER: status should show Stopped after stop" { - run machine status $NAME - echo ${output} - [ "$status" -eq 0 ] - [[ ${output} == *"Stopped"* ]] -} - -@test "$DRIVER: restart the machine" { - run machine start $NAME - echo ${output} - [ "$status" -eq 0 ] -} - -@test "$DRIVER: status should show Running after restart" { - run machine status $NAME - echo ${output} - [ "$status" -eq 0 ] - [[ ${output} == *"Running"* ]] -} - -@test "$DRIVER: savestate the machine" { - run VBoxManage controlvm $NAME savestate - [ "$status" -eq 0 ] -} - -@test "$DRIVER: status should show Saved after save" { - run machine status $NAME - echo ${output} - [ "$status" -eq 0 ] - [[ ${output} == *"Saved"* ]] -} - -@test "$DRIVER: should start after save" { - run machine start $NAME - echo ${output} - [ "$status" -eq 0 ] -} - -@test "$DRIVER: status should show Running after restart" { - run machine status $NAME - echo ${output} - [ "$status" -eq 0 ] - [[ ${output} == *"Running"* ]] -} - -@test "$DRIVER: pause the machine again" { - run vboxmanage controlvm $NAME pause - echo ${output} - [ "$status" -eq 0 ] -} - -@test "$DRIVER: remove the paused machine" { - run machine rm $NAME - echo ${output} - [ "$status" -eq 0 ] -} \ No newline at end of file diff --git a/test/integration/drivers/virtualbox/bad-create-iso.bats b/test/integration/virtualbox/bad-create-iso.bats similarity index 83% rename from test/integration/drivers/virtualbox/bad-create-iso.bats rename to test/integration/virtualbox/bad-create-iso.bats index b79bd36d..fccf409f 100644 --- a/test/integration/drivers/virtualbox/bad-create-iso.bats +++ b/test/integration/virtualbox/bad-create-iso.bats @@ -2,7 +2,9 @@ load ${BASE_TEST_DIR}/helpers.bash -force_env DRIVER virtualbox +if [[ "$DRIVER" != "virtualbox" ]]; then + exit 0 +fi export BAD_URL="http://dev.null:9111/bad.iso" diff --git a/test/integration/drivers/virtualbox/certs-checksum.bats b/test/integration/virtualbox/certs-checksum.bats similarity index 94% rename from test/integration/drivers/virtualbox/certs-checksum.bats rename to test/integration/virtualbox/certs-checksum.bats index af1c76f5..be648b91 100644 --- a/test/integration/drivers/virtualbox/certs-checksum.bats +++ b/test/integration/virtualbox/certs-checksum.bats @@ -2,7 +2,9 @@ load ${BASE_TEST_DIR}/helpers.bash -force_env DRIVER virtualbox +if [[ "$DRIVER" != "virtualbox" ]]; then + exit 0 +fi @test "$DRIVER: create" { run machine create -d $DRIVER $NAME diff --git a/test/integration/drivers/virtualbox/custom-mem-disk.bats b/test/integration/virtualbox/custom-mem-disk.bats similarity index 96% rename from test/integration/drivers/virtualbox/custom-mem-disk.bats rename to test/integration/virtualbox/custom-mem-disk.bats index e95e2db5..4e344840 100644 --- a/test/integration/drivers/virtualbox/custom-mem-disk.bats +++ b/test/integration/virtualbox/custom-mem-disk.bats @@ -2,7 +2,9 @@ load ${BASE_TEST_DIR}/helpers.bash -force_env DRIVER virtualbox +if [[ "$DRIVER" != "virtualbox" ]]; then + exit 0 +fi # Default memsize is 1024MB and disksize is 20000MB # These values are defined in drivers/virtualbox/virtualbox.go diff --git a/test/integration/virtualbox/pause-save-start.bats b/test/integration/virtualbox/pause-save-start.bats new file mode 100644 index 00000000..06904391 --- /dev/null +++ b/test/integration/virtualbox/pause-save-start.bats @@ -0,0 +1,57 @@ +#!/usr/bin/env bats + +load ${BASE_TEST_DIR}/helpers.bash + +if [[ "$DRIVER" != "virtualbox" ]]; then + exit 0 +fi + +@test "$DRIVER: create" { + run machine create -d $DRIVER $NAME + [ "$status" -eq 0 ] +} + +@test "$DRIVER: VBoxManage pause" { + run VBoxManage controlvm $NAME pause + [ "$status" -eq 0 ] +} + +@test "$DRIVER: machine should show paused after VBoxManage pause" { + run machine ls + [ "$status" -eq 0 ] + [[ ${lines[1]} == *"Paused"* ]] +} + +@test "$DRIVER: start after paused" { + run machine start $NAME + [ "$status" -eq 0 ] +} + +@test "$DRIVER: machine should show running after start" { + run machine ls + [ "$status" -eq 0 ] + [[ ${lines[1]} == *"Running"* ]] +} + +@test "$DRIVER: VBoxManage savestate" { + run VBoxManage controlvm $NAME savestate + [ "$status" -eq 0 ] +} + +@test "$DRIVER: machine should show saved after VBoxManage savestate" { + run machine ls + [ "$status" -eq 0 ] + [[ ${lines[1]} == *"$NAME"* ]] + [[ ${lines[1]} == *"Saved"* ]] +} + +@test "$DRIVER: start after saved" { + run machine start $NAME + [ "$status" -eq 0 ] +} + +@test "$DRIVER: machine should show running after start" { + run machine ls + [ "$status" -eq 0 ] + [[ ${lines[1]} == *"Running"* ]] +} diff --git a/test/integration/drivers/virtualbox/upgrade.bats b/test/integration/virtualbox/upgrade.bats similarity index 93% rename from test/integration/drivers/virtualbox/upgrade.bats rename to test/integration/virtualbox/upgrade.bats index 503dc267..3800adfa 100644 --- a/test/integration/drivers/virtualbox/upgrade.bats +++ b/test/integration/virtualbox/upgrade.bats @@ -2,7 +2,9 @@ load ${BASE_TEST_DIR}/helpers.bash -force_env DRIVER virtualbox +if [[ "$DRIVER" != "virtualbox" ]]; then + exit 0 +fi export OLD_ISO_URL="https://github.com/boot2docker/boot2docker/releases/download/v1.4.1/boot2docker.iso" From 164bb015402e9c0cfc6e9b51b0b37ad5caabf045 Mon Sep 17 00:00:00 2001 From: Jean-Laurent de Morlhon Date: Mon, 23 Nov 2015 10:36:43 +0100 Subject: [PATCH 2/4] Unused file Signed-off-by: Jean-Laurent de Morlhon --- test/integration/azure/test.cer | Bin 692 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 test/integration/azure/test.cer diff --git a/test/integration/azure/test.cer b/test/integration/azure/test.cer deleted file mode 100644 index 87900e4d9395b264fe32be1de1edfc06de82939e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 692 zcmXqLV%lKP#3Z?ZnTe5!iIZW{&r2JQ?>nw)z{|#|)#lOmotKf3m6gH3)sWkOlZ`o) zg-w_#G}utsKoG>?5atTb&rQ`0E=ep&HB>Z^2MKZsOL*p$q!#6+mMDa0rle<<6e|Rj zR4VwCq!`GF^BS5OSQ;7|m>QdynnwY-Wkjmr%hml((b!%LQrMT|w{ z{+e{lEBultF5PL_n7(<-6#v429)nVlv@%PcK~4i!1q(fwxKk;}nvkNN2V|`<3#$P$ zBjbPMfCMH4W?%@;SpKm5%Dlq0cMN{qtZT2F{(@=YnI0~eyk#6ElS|}|?)$dy+s@s$ zp1qJ@m0Pg?nN?KGWu3ptA6D;5TC(9v{70rs*D9|~`l%|=eQuB7r(+K%9{Xy}qi)KU wApOTX@}umjgzquigVuB0SQz~LnfPyxD}sJ|KUI8bJ6XQ}geJeoIkhjr07iuT-T(jq From 975faf57b39021f84fd1e0a9795d5830c518cdd1 Mon Sep 17 00:00:00 2001 From: Jean-Laurent de Morlhon Date: Mon, 23 Nov 2015 10:36:53 +0100 Subject: [PATCH 3/4] Unused file Signed-off-by: Jean-Laurent de Morlhon --- test/integration/data/config-v0.1.0.json | 24 ------------ test/integration/data/config-v0.2.0.json | 49 ------------------------ 2 files changed, 73 deletions(-) delete mode 100644 test/integration/data/config-v0.1.0.json delete mode 100644 test/integration/data/config-v0.2.0.json diff --git a/test/integration/data/config-v0.1.0.json b/test/integration/data/config-v0.1.0.json deleted file mode 100644 index d7d53962..00000000 --- a/test/integration/data/config-v0.1.0.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "DriverName": "virtualbox", - "Driver": { - "MachineName": "test-vbox", - "SSHUser": "docker", - "SSHPort": 45515, - "Memory": 1024, - "DiskSize": 20000, - "Boot2DockerURL": "", - "CaCertPath": "/tmp/store/certs/ca.pem", - "PrivateKeyPath": "/tmp/store/certs/ca-key.pem", - "SwarmMaster": false, - "SwarmHost": "tcp://0.0.0.0:3376", - "SwarmDiscovery": "" - }, - "CaCertPath": "/tmp/store/certs/ca.pem", - "ServerCertPath": "", - "ServerKeyPath": "", - "PrivateKeyPath": "/tmp/store/certs/ca-key.pem", - "ClientCertPath": "", - "SwarmMaster": false, - "SwarmHost": "tcp://0.0.0.0:3376", - "SwarmDiscovery": "" -} diff --git a/test/integration/data/config-v0.2.0.json b/test/integration/data/config-v0.2.0.json deleted file mode 100644 index cccdc451..00000000 --- a/test/integration/data/config-v0.2.0.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "DriverName": "virtualbox", - "Driver": { - "MachineName": "test-vbox", - "SSHUser": "docker", - "SSHPort": 51575, - "Memory": 1024, - "DiskSize": 20000, - "Boot2DockerURL": "", - "CaCertPath": "/tmp/store/certs/ca.pem", - "PrivateKeyPath": "/tmp/store/certs/ca-key.pem", - "SwarmMaster": false, - "SwarmHost": "tcp://0.0.0.0:3376", - "SwarmDiscovery": "" - }, - "CaCertPath": "/tmp/store/certs/ca.pem", - "PrivateKeyPath": "/tmp/store/certs/ca-key.pem", - "ServerCertPath": "", - "ServerKeyPath": "", - "ClientCertPath": "", - "StorePath": "/tmp/store/machines/test-vbox", - "EngineOptions": { - "Dns": null, - "GraphDir": "", - "Ipv6": false, - "Labels": null, - "LogLevel": "", - "StorageDriver": "", - "SelinuxEnabled": false, - "TlsCaCert": "", - "TlsCert": "", - "TlsKey": "", - "TlsVerify": false, - "RegistryMirror": null - }, - "SwarmOptions": { - "Address": "", - "Discovery": "", - "Master": false, - "Host": "", - "Strategy": "", - "Heartbeat": 0, - "Overcommit": 0, - "TlsCaCert": "", - "TlsCert": "", - "TlsKey": "", - "TlsVerify": false - } -} From f4cada3867e3b5d3f46a5a611620c1d0268cb887 Mon Sep 17 00:00:00 2001 From: Jean-Laurent de Morlhon Date: Mon, 23 Nov 2015 10:37:59 +0100 Subject: [PATCH 4/4] Unused hierarchy Signed-off-by: Jean-Laurent de Morlhon --- test/integration/provision/{os => }/rancheros.bats | 7 ++++++- test/integration/provision/{os => }/redhat.bats | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) rename test/integration/provision/{os => }/rancheros.bats (81%) rename test/integration/provision/{os => }/redhat.bats (80%) diff --git a/test/integration/provision/os/rancheros.bats b/test/integration/provision/rancheros.bats similarity index 81% rename from test/integration/provision/os/rancheros.bats rename to test/integration/provision/rancheros.bats index fccafc2a..62c726f2 100644 --- a/test/integration/provision/os/rancheros.bats +++ b/test/integration/provision/rancheros.bats @@ -2,7 +2,12 @@ load ${BASE_TEST_DIR}/helpers.bash -force_env DRIVER virtualbox + +# this should move to the makefile + +if [[ "$DRIVER" != "virtualbox" ]]; then + exit 0 +fi export RANCHEROS_VERSION="v0.3.1" export RANCHEROS_ISO="https://github.com/rancherio/os/releases/download/$RANCHEROS_VERSION/machine-rancheros.iso" diff --git a/test/integration/provision/os/redhat.bats b/test/integration/provision/redhat.bats similarity index 80% rename from test/integration/provision/os/redhat.bats rename to test/integration/provision/redhat.bats index b44bbc4f..f2b249a6 100644 --- a/test/integration/provision/os/redhat.bats +++ b/test/integration/provision/redhat.bats @@ -2,7 +2,11 @@ load ${BASE_TEST_DIR}/helpers.bash -force_env DRIVER amazonec2 +# this should move to the makefile + +if [[ "$DRIVER" != "amazonec2" ]]; then + exit 0 +fi require_env AWS_VPC_ID require_env AWS_ACCESS_KEY_ID