ossvc: imp code

Author: Mizzick

internal/ossvc/defaultmanager_internal_test.go

@@ -132,8 +132,8 @@ func TestManager_Status_unixSystemV(t *testing.T) {
 // newTestSvc creates a new *testService with all methods set to panic, sets it
 // in the chosen system, and returns it.  The caller can then set the desired
 // behavior of the service via overriding its methods.
-func newTestSvc(t *testing.T) (svc *testService) {
-	t.Helper()
+func newTestSvc(tb testing.TB) (svc *testService) {
+	tb.Helper()
 
 	svc = &testService{
 		OnRun:       func() (err error) { panic(testutil.UnexpectedCall()) },

internal/ossvc/service_openbsd.go

@@ -324,20 +324,24 @@ func (s *openbsdRunComService) runCom(cmd string) (out string, err error) {
 	}
 
 	stdoutBuf := bytes.Buffer{}
+	stderrBuf := bytes.Buffer{}
+
 	// TODO(s.chzhen):  Pass context.
 	err = executil.Run(context.TODO(), s.cmdCons, &executil.CommandConfig{
-		Stderr: &stdoutBuf,
+		Stderr: &stderrBuf,
 		Stdout: ioutil.NewTruncatedWriter(&stdoutBuf, aghos.MaxCmdOutputSize),
 		Path:   scriptPath,
 		Args:   []string{cmd},
 	})
-	if errors.Is(err, os.ErrNotExist) {
-		// TODO(e.burkov):  It's possible that os.ErrNotExist is caused by
-		// something different than the service script's non-existence.
+
+	switch {
+	case errors.Is(err, os.ErrNotExist):
 		return "", service.ErrNotInstalled
+	case err != nil:
+		return stderrBuf.String(), err
 	}
 
-	return stdoutBuf.String(), err
+	return stdoutBuf.String(), nil
 }
 
 // Status implements service.Service interface for *openbsdRunComService.