Merge pull request #4 from NReilingh/lockfile-checking

Lockfile checking

Author: NReilingh

.github/workflows/release.yml

@@ -30,5 +30,5 @@ jobs:
         COMMITTER_TOKEN: ${{ secrets.COMMITTER_TOKEN }}
       with:
         formula-name: archive-fusionvm
-        homebrew-tap: nreilingh/homebrew-nreilingh
+        homebrew-tap: nreilingh/homebrew-tap
         download-url: ${{ steps.upload_release_asset.outputs.browser_download_url }}

.gitignore

@@ -1,2 +1,3 @@
+/tests/_support/temp/*
 /tests/_output/*
 !/tests/_output/.gitkeep

archive_fusionvm

@@ -19,10 +19,13 @@ echo "SRCPATH is $SRCPATH"
 
 i=0
 
-while true; do
-	# Test whether running .vmx files are inside our path.
-	running=(${(@f)"$(vmrun list | grep "$SRCPATH")"})
+# Test whether running .vmx files are inside our path.
+running=(${(@f)"$(vmrun list | grep "$SRCPATH")"})
+
+# Save this initial list of .vmx files
+vmxlist=($running)
 
+while true; do
 	echo "Current running VM list is $running"
 
 	# If no VMs are running, we can continue.
@@ -40,6 +43,19 @@ while true; do
 		echo "Suspending $vmx"
 		vmrun suspend "$vmx"
 	done
+
+	# Refresh running VM list
+	running=(${(@f)"$(vmrun list | grep "$SRCPATH")"})
+done
+
+# Test that every VMX in the list has no lockfile; otherwise quit Fusion
+echo "Checking for lockfiles for VM list $vmxlist"
+for vmx in $vmxlist; do
+	echo "Testing lockfile $vmx.lck"
+	if [ -f "$vmx.lck" ]; then
+		osascript -e 'tell application "VMware Fusion" to quit'
+		break
+	fi
 done
 
 # Create a compressed read-only .dmg. HFS+ seems to be smaller than APFS.

tests/_support/mocks/hdiutil

@@ -1,5 +1,5 @@
 #!/usr/bin/env zsh
 
-print -l $@ > $TEMP/hdiutil.calls
+print -l $@ >> $TEMP/hdiutil.calls
 
 exit 0

tests/_support/mocks/osascript

@@ -0,0 +1,5 @@
+#!/usr/bin/env zsh
+
+echo "$@" >> $TEMP/osascript.calls
+
+exit 0

tests/archive_fusionvm.zunit

@@ -2,15 +2,11 @@
 
 # $TEMP is set up in bootstrap
 @setup {
-  [ -d $TEMP ] || mkdir $TEMP
+  [ ! -d $TEMP ] || rm -r $TEMP; mkdir $TEMP
   [ -f $TEMP/decoy_file ] || touch $TEMP/decoy_file
   [ -d $TEMP/decoy_dir ] || mkdir $TEMP/decoy_dir
 }
 
-@teardown {
-  rm -r $TEMP
-}
-
 @test 'Exit with error when no arguments are supplied' {
   run archive_fusionvm
 
@@ -114,6 +110,57 @@
   fi
 }
 
+@test 'osascript executed when lockfile exists' {
+  vmx="$TEMP/decoy_dir/example vm.vmx"
+
+  cat > $TEMP/vmrun_list_1 <<-EOF
+	$vmx
+	EOF
+
+  touch "$vmx.lck"
+
+  run archive_fusionvm $TEMP/decoy_dir $TEMP/out.dmg
+
+  if [ -f $TEMP/osascript.calls ]; then
+    pass
+  else
+    fail 'osascript was not called'
+  fi
+}
+
+@test 'osascript is not executed if no lockfiles exist' {
+  cat > $TEMP/vmrun_list_1 <<-EOF
+	$TEMP/decoy_dir/example vm.vmx
+	EOF
+
+  run archive_fusionvm $TEMP/decoy_dir $TEMP/out.dmg
+
+  if [ -f $TEMP/osascript.calls ]; then
+    fail 'osascript was called'
+  else
+    pass
+  fi
+}
+
+@test 'osascript is executed only once if multiple lockfiles exist' {
+  vmone="$TEMP/decoy_dir/examplevm one.vmx"
+  vmtwo="$TEMP/decoy_dir/examplevmtwo.vmx"
+
+  cat > $TEMP/vmrun_list_1 <<-EOF
+	$vmone
+	$vmtwo
+	EOF
+
+  touch "$vmone.lck"
+  touch "$vmtwo.lck"
+
+  run archive_fusionvm $TEMP/decoy_dir $TEMP/out.dmg
+
+  osascriptcalls=(${(@f)"$(<$TEMP/osascript.calls)"})
+
+  assert ${#osascriptcalls} equals 1
+}
+
 @test 'hdiutil create is executed' {
   run archive_fusionvm $TEMP/decoy_dir $TEMP/out.dmg