scanner: Remove ippusb_manager support
ippusb_manager is no longer in active use and will be entirely removed
soon. Stop restarting its portion of the printing system to avoid
missing service errors once ippusb_manager is no longer installed. This
should have no effect on current tests since cups and lorgnette have
both already been changed to use ippusb-bridge for IPP-over-USB
connections.
BUG=b:179413348
TEST=tast run '("dep:virtual_usb_printer")'
Change-Id: Id18e48ea52d683dd386ca7cf53b3d3e9a4037d58
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/tast-tests/+/2830028
Reviewed-by: Kalvin Lee <kdlee@chromium.org>
Reviewed-by: Kyra Moed <kmoed@google.com>
Reviewed-by: Hidehiko Abe <hidehiko@chromium.org>
Commit-Queue: Benjamin Gordon <bmgordon@chromium.org>
Tested-by: Benjamin Gordon <bmgordon@chromium.org>
diff --git a/src/chromiumos/tast/local/bundles/cros/scanner/cups/services.go b/src/chromiumos/tast/local/bundles/cros/scanner/cups/services.go
index 3c11d94..c503ab5 100644
--- a/src/chromiumos/tast/local/bundles/cros/scanner/cups/services.go
+++ b/src/chromiumos/tast/local/bundles/cros/scanner/cups/services.go
@@ -8,7 +8,6 @@
import (
"context"
- "chromiumos/tast/common/testexec"
"chromiumos/tast/errors"
"chromiumos/tast/local/printing/printer"
"chromiumos/tast/local/printing/usbprinter"
@@ -33,19 +32,9 @@
// RestartPrintingSystem restarts all of the printing-related processes, leaving the
// system in an idle state.
func RestartPrintingSystem(ctx context.Context, devInfo usbprinter.DevInfo) error {
- if err := upstart.StopJob(ctx, "ippusb"); err != nil {
- return errors.Wrap(err, "failed to stop ippusb service")
- }
if err := printer.ResetCups(ctx); err != nil {
return errors.Wrap(err, "failed to reset CUPS")
}
- // Sometimes upstart loses track of the ippusb_manager process and leaves an unreaped
- // minijail child around. If this happens, it will still have the main socket open.
- // Kill everything with that socket open just to make sure it's all the way gone.
- cmd := testexec.CommandContext(ctx, "fuser", "-sk", "/run/ippusb/ippusb_manager.sock")
- if err := cmd.Run(); err != nil {
- return errors.Wrap(err, "failed to kill processes with ippusb_manager.sock open")
- }
if err := upstart.RestartJob(ctx, "upstart-socket-bridge"); err != nil {
return errors.Wrap(err, "failed to restart upstart-socket-bridge")
