From 3303332d6bd4fc694f31a49d29beadf6ad551e38 Mon Sep 17 00:00:00 2001
From: James Ring <sjr@jdns.org>
Date: Tue, 14 Apr 2026 02:51:26 -0700
Subject: [PATCH] tests: pass -o to saned, it will go away by itself

---
 .../southsky/jfreesane/SaneDaemonRule.java    | 29 +------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/src/test/java/au/com/southsky/jfreesane/SaneDaemonRule.java b/src/test/java/au/com/southsky/jfreesane/SaneDaemonRule.java
index 874e739..c518584 100644
--- a/src/test/java/au/com/southsky/jfreesane/SaneDaemonRule.java
+++ b/src/test/java/au/com/southsky/jfreesane/SaneDaemonRule.java
@@ -57,7 +57,7 @@ protected void before() throws Throwable {
       return;
     }
 
-    saneDaemonBuilder = new ProcessBuilder("saned", "-l", "-p", "0", "-e", "-d", "8");
+    saneDaemonBuilder = new ProcessBuilder("saned", "-l", "-p", "0", "-e", "-d", "8", "-o");
     saneDaemonBuilder.directory(tempDir.getRoot());
   }
 
@@ -123,33 +123,6 @@ public void protectDevice(String name, String username, String password) {
     passwords.add(auth);
   }
 
-  @Override
-  protected void after() {
-    if (saneDaemon == null) {
-      return;
-    }
-
-    if (saneDaemon.isAlive()) {
-      logger.fine("Stopping SANE daemon");
-      saneDaemon.descendants().forEach(ProcessHandle::destroy);
-      saneDaemon.destroy();
-    }
-
-    try {
-      if (saneDaemon.waitFor(10, TimeUnit.SECONDS)) {
-        logger.info("SANE daemon exited with status " + saneDaemon.exitValue());
-      } else {
-        logger.info("Timed out waiting for SANE daemon to exit, forcibly terminating.");
-      }
-    } catch (InterruptedException e) {
-      logger.info("Interrupted while waiting for SANE daemon to exit, forcibly terminating.");
-      Thread.currentThread().interrupt();
-    } finally {
-      // This is a nop if the process is gone already.
-      saneDaemon.destroyForcibly();
-    }
-  }
-
   private static final class SaneLogListener extends Thread {
     private static final Pattern PORT_TYPE_PATTERN =
         Pattern.compile("\\[(\\d+)] socket .* using IPv([4|6])$");