From dd8164a0a99fd44991260860966605dd45ba276c Mon Sep 17 00:00:00 2001
From: "Dave Musicant (home machine)" <dmusicant@carleton.edu>
Date: Sun, 4 Dec 2022 11:26:00 -0600
Subject: [PATCH] trying again

---
 tests/spaces.bats | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/tests/spaces.bats b/tests/spaces.bats
index 7d5e2d9..f5c7566 100644
--- a/tests/spaces.bats
+++ b/tests/spaces.bats
@@ -23,6 +23,7 @@ function spaces_in_target_dir { #@test
     # Start up gitwatch with logging, see if works
     "${BATS_TEST_DIRNAME}"/../gitwatch.sh -l 10 "$testdir/local/remote" 3>&- &
     GITWATCH_PID=$!
+    echo "$GITWATCH_PID"
 
     # Keeps kill message from printing to screen
     disown
@@ -30,22 +31,22 @@ function spaces_in_target_dir { #@test
     # Create a file, verify that it hasn't been added yet, then commit
     cd remote
 
-    # According to inotify documentation, a race condition results if you write
-    # to directory too soon after it has been created; hence, a short wait.
-    sleep 1
-    echo "line1" >> file1.txt
+    # # According to inotify documentation, a race condition results if you write
+    # # to directory too soon after it has been created; hence, a short wait.
+    # sleep 1
+    # echo "line1" >> file1.txt
 
-    # Wait a bit for inotify to figure out the file has changed, and do its add,
-    # and commit
-    sleep "$WAITTIME"
+    # # Wait a bit for inotify to figure out the file has changed, and do its add,
+    # # and commit
+    # sleep "$WAITTIME"
 
-    # Make a new change
-    echo "line2" >> file1.txt
-    sleep "$WAITTIME"
+    # # Make a new change
+    # echo "line2" >> file1.txt
+    # sleep "$WAITTIME"
 
-    # Check commit log that the diff is in there
-    run git log -1 --oneline
-    [[ $output == *"file1.txt"* ]]
+    # # Check commit log that the diff is in there
+    # run git log -1 --oneline
+    # [[ $output == *"file1.txt"* ]]
 
     echo '# Teardown started' >&3
     # Remove testing directories
@@ -53,14 +54,16 @@ function spaces_in_target_dir { #@test
     cd /tmp
 
     # Kill background process
-    kill -9 %1
-    fg
+    # kill -9 %1
+    # fg
 
     # Also make sure to kill fswatch if on Mac
-    killall fswatch
+    killall fswatch || true
     # Make sure gitwatch script gets killed if script stopped background
     # Must kill the entire tree of processes generated
-    pkill -15 -P "$GITWATCH_PID"
+    pkill -15 -f gitwatch.sh
+    pkill -15 -f gitwatch.sh
+    # pkill -15 -P "$GITWATCH_PID"
 
     echo '# Teardown complete' >&3
 }