diff --git a/tests/parallels/boot2docker_vagrant_parallels.bats b/tests/parallels/boot2docker_vagrant_parallels.bats index 5cca5fb..c81666a 100644 --- a/tests/parallels/boot2docker_vagrant_parallels.bats +++ b/tests/parallels/boot2docker_vagrant_parallels.bats @@ -5,7 +5,7 @@ DOCKER_TARGET_VERSION=1.9.0 # Assume that Vagrantfile exists and basebox is added @test "vagrant up" { run vagrant destroy -f - run vagrant box remove boot2docker-virtualbox-test + run vagrant box remove boot2docker-parallels-test cp vagrantfile.orig Vagrantfile vagrant up --provider=parallels } @@ -40,7 +40,7 @@ DOCKER_TARGET_VERSION=1.9.0 } @test "Default synced folder is shared via prl_fs" { - mount_point=$(vagrant ssh -c 'mount' | grep prl_fs | awk '{ print $3 }') + mount_point=$(vagrant ssh -c 'mount' | grep 'tests/parallels.*prl_fs' | awk '{ print $3 }') [ $(vagrant ssh -c "ls -l ${mount_point}/Vagrantfile | wc -l" -- -n -T) -ge 1 ] } @@ -55,7 +55,7 @@ DOCKER_TARGET_VERSION=1.9.0 @test "Default synced folder is shared via NFS if B2D_NFS_SYNC is set" { export B2D_NFS_SYNC=1 vagrant reload - mount_point=$(vagrant ssh -c 'mount' | grep nfs | awk '{ print $3 }') + mount_point=$(vagrant ssh -c 'mount' | grep 'tests/parallels.*nfs' | awk '{ print $3 }') [ $(vagrant ssh -c "ls -l $mount_point/Vagrantfile | wc -l" -- -n -T) -ge 1 ] unset B2D_NFS_SYNC } diff --git a/tests/virtualbox/boot2docker_vagrant_virtualbox.bats b/tests/virtualbox/boot2docker_vagrant_virtualbox.bats index 3b7bcf9..7ccc7ab 100644 --- a/tests/virtualbox/boot2docker_vagrant_virtualbox.bats +++ b/tests/virtualbox/boot2docker_vagrant_virtualbox.bats @@ -52,14 +52,14 @@ DOCKER_TARGET_VERSION=1.9.0 } @test "We have a default synced folder thru vboxsf instead of NFS" { - mount_point=$(vagrant ssh -c 'mount' | grep vboxsf | awk '{ print $3 }') + mount_point=$(vagrant ssh -c 'mount' | grep 'tests/virtualbox.*vboxsf' | awk '{ print $3 }') [ $(vagrant ssh -c "ls -l ${mount_point}/Vagrantfile | wc -l" -- -n -T) -ge 1 ] } @test "We have a NFS synced folder if B2D_NFS_SYNC is set (admin password required, will fail on Windows)" { export B2D_NFS_SYNC=1 vagrant reload - mount_point=$(vagrant ssh -c 'mount' | grep nfs | awk '{ print $3 }') + mount_point=$(vagrant ssh -c 'mount' | grep 'tests/virtualbox.*nfs' | awk '{ print $3 }') [ $(vagrant ssh -c "ls -l $mount_point/Vagrantfile | wc -l" -- -n -T) -ge 1 ] unset B2D_NFS_SYNC }