Skip to content

tests: pass -o to saned, it will go away by itself #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sjamesr wants to merge 1 commit into
base: main
Choose a base branch
from
Open

tests: pass -o to saned, it will go away by itself #120

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 1 addition & 28 deletions src/test/java/au/com/southsky/jfreesane/SaneDaemonRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}

Expand Down Expand Up @@ -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])$");
Expand Down
Loading