refactor: [SyslogRelay] remove the return value of the stop

electricbubble · Apr 24, 2021 · d73a058 · d73a058
1 parent b6b9bb3
commit d73a058
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/device.go b/device.go
@@ -457,12 +457,11 @@ func (d *device) Syslog() (lines <-chan string, err error) {
 	return d.syslogRelay.Lines(), nil
 }
 
-func (d *device) SyslogStop() (err error) {
-	if _, err = d.syslogRelayService(); err != nil {
-		return err
+func (d *device) SyslogStop() {
+	if d.syslogRelay == nil {
+		return
 	}
 	d.syslogRelay.Stop()
-	return nil
 }
 
 func (d *device) XCTest(bundleID string) (out <-chan string, cancel context.CancelFunc, err error) {

diff --git a/device_test.go b/device_test.go
@@ -118,6 +118,8 @@ func Test_device_AppUninstall(t *testing.T) {
 func Test_device_Syslog(t *testing.T) {
 	setupLockdownSrv(t)
 
+	dev.SyslogStop()
+
 	lines, err := dev.Syslog()
 	if err != nil {
 		t.Fatal(err)
@@ -137,9 +139,6 @@ func Test_device_Syslog(t *testing.T) {
 
 	// <-done
 	time.Sleep(3 * time.Second)
-	err = dev.SyslogStop()
-	if err != nil {
-		t.Fatal(err)
-	}
+	dev.SyslogStop()
 	time.Sleep(200 * time.Millisecond)
 }
diff --git a/idevice.go b/idevice.go
@@ -59,7 +59,7 @@ type Device interface {
 
 	syslogRelayService() (syslogRelay SyslogRelay, err error)
 	Syslog() (lines <-chan string, err error)
-	SyslogStop() (err error)
+	SyslogStop()
 
 	XCTest(bundleID string) (out <-chan string, cancel context.CancelFunc, err error)
 }