Merge pull request #88 from joesturge/joesturge-patch-1

fix: unexpected state test

Author: joesturge

tests/bats/legacy-forge/legacy-forge.bats

@@ -5,6 +5,16 @@ load ../util.bash
 project="./tests/bats/legacy-forge"
 
 @test "Legacy Forge - Test lazymc stops server when idle" {
+    # restart the lazymc container
+    restart_container lazymc-legacy-forge
+
+    # reset the start timestamp
+    reset_timestamp
+
+    #
+    # The above steps ensures that the containers are in a clean state
+    #
+
     # wait for lazymc process to start
     wait_for_formatted_log "lazymc-legacy-forge" "INFO" "lazymc-docker-proxy::entrypoint" "Starting lazymc process for group: mc..."
 

tests/bats/multi-server/multi-server.bats

@@ -5,6 +5,16 @@ load ../util.bash
 project="./tests/bats/multi-server"
 
 @test "Multiple Servers - Test primary and secondary servers stop when idle" {
+    # restart the lazymc container
+    restart_container lazymc-multi-server
+
+    # reset the start timestamp
+    reset_timestamp
+
+    #
+    # The above steps ensures that the containers are in a clean state
+    #
+
     # wait for primary lazymc process to start
     wait_for_formatted_log "lazymc-multi-server" "INFO" "lazymc-docker-proxy::entrypoint" "Starting lazymc process for group: primary..."
 

tests/bats/unexpected-server-state-recovery/unexpected-server-state-recovery.bats

@@ -33,6 +33,8 @@ project="./tests/bats/unexpected-server-state-recovery"
     # wait for the mincraft server to be ready
     wait_for_log "mc-unexpected-server-state-recovery" "RCON running on 0.0.0.0:25575" 300
 
+    wait_for_formatted_log "lazymc-unexpected-server-state-recovery" "INFO" "mc::lazymc::monitor" "Server is now online"
+
     # start the client container to make lazymc want to shutdown the server
     start_container mc-client-unexpected-server-state-recovery
 
@@ -43,7 +45,7 @@ project="./tests/bats/unexpected-server-state-recovery"
     stop_container mc-client-unexpected-server-state-recovery
 
     # wait for lazymc to be in an unexpected state
-    wait_for_formatted_log "lazymc-unexpected-server-state-recovery" "WARN" "mc::lazymc" "Failed to stop server, no more suitable stopping method to use" 120
+    wait_for_formatted_log "lazymc-unexpected-server-state-recovery" "WARN" "mc::lazymc" "Failed to stop server, no more suitable stopping method to use" 300
 
     # wait for lazymc-docker-proxy to detect the server is in an unexpected state
     wait_for_formatted_log "lazymc-unexpected-server-state-recovery" "WARN" "lazymc-docker-proxy::entrypoint" "Unexpected server state detected, force stopping mc server container..."

tests/bats/vanilla/vanilla.bats

@@ -5,6 +5,16 @@ load ../util.bash
 project="./tests/bats/vanilla"
 
 @test "Vanilla - Test lazymc stops server when idle" {
+    # restart the lazymc container
+    restart_container lazymc-vanilla
+
+    # reset the start timestamp
+    reset_timestamp
+
+    #
+    # The above steps ensures that the containers are in a clean state
+    #
+
     # wait for lazymc process to start
     wait_for_formatted_log "lazymc-vanilla" "INFO" "lazymc-docker-proxy::entrypoint" "Starting lazymc process for group: mc..."