From 32499676d9856a7b81fe1cc4fb518b49a7e8b72f Mon Sep 17 00:00:00 2001 From: Aidan Hahn Date: Mon, 27 May 2019 09:57:19 -0700 Subject: [PATCH] remember to shutdown logger, finally fix that pesky test --- src/main/java/JobServ/JobServServer.java | 3 ++- src/test/java/JobServ/ProcessManagerTestImplementation.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/JobServ/JobServServer.java b/src/main/java/JobServ/JobServServer.java index 070e35f..94649c8 100644 --- a/src/main/java/JobServ/JobServServer.java +++ b/src/main/java/JobServ/JobServServer.java @@ -60,7 +60,8 @@ public class JobServServer { @Override public void run() { logger.write("Shutting down server"); - manager.shutdown(); + logger.shutdown(); + manager.shutdown(); JobServServer.this.stop(); } }); diff --git a/src/test/java/JobServ/ProcessManagerTestImplementation.java b/src/test/java/JobServ/ProcessManagerTestImplementation.java index 9e879cb..58594b5 100644 --- a/src/test/java/JobServ/ProcessManagerTestImplementation.java +++ b/src/test/java/JobServ/ProcessManagerTestImplementation.java @@ -22,8 +22,8 @@ class ProcessManagerTestImplementation extends ProcessManager { super.getLock(pid); System.err.println("[1] Long Call Has Lock"); - // hold lock for 7 seconds, more than double normal timeout. - Thread.sleep(4000); + // hold lock for 3.5 seconds, more than double normal timeout. + Thread.sleep(3500); super.releaseLock(pid);