tests for *Service

service.go

@@ -32,8 +32,8 @@ type Service struct {
 	// called. This function is called by Run() before returning.
 	Ping Ping
 
-	// Image is the container image you wish to run.
-	Image string
+	// Input is used to control the inputs to Run()
+	Input *ClientInput
 
 	// Timeout defines a duration that's used to prevent operations
 	// related to docker from running forever. If this value is not
@@ -54,16 +54,14 @@ func (s *Service) timeout() time.Duration {
 
 // Run will run the container.
 func (s *Service) Run() error {
-	if s.Image == "" {
-		return errors.New("No image provided")
+	if s.Input == nil {
+		return errors.New("Input field not provided")
 	}
 
 	ctx, cancel := context.WithTimeout(context.Background(), s.timeout())
 	defer cancel()
 
-	runInput := NewClientInput(s.Image)
-
-	info, err := s.Client.RunContainer(ctx, runInput)
+	info, err := s.Client.RunContainer(ctx, s.Input)
 	if err != nil {
 		return err
 	}

service_test.go

@@ -1,10 +1,12 @@
 package dockertest
 
 import (
-	. "gopkg.in/check.v1"
-	"time"
-	"net"
 	"fmt"
+	"net"
+	"time"
+
+	"github.com/pkg/errors"
+	. "gopkg.in/check.v1"
 )
 
 type ServiceTest struct{}
@@ -33,8 +35,8 @@ func (*ServiceTest) TestRunWithPing(c *C) {
 
 	input := NewClientInput(testImage)
 	input.Ports.Add(&Port{
-		Private: 80,
-		Public: RandomPort,
+		Private:  80,
+		Public:   RandomPort,
 		Protocol: ProtocolTCP,
 	})
 	svc := dc.Service(input)
@@ -52,4 +54,18 @@ func (*ServiceTest) TestRunWithPing(c *C) {
 	}
 	c.Assert(svc.Run(), IsNil)
 	c.Assert(svc.Terminate(), IsNil)
-}
+}
+
+func (*ServiceTest) TestErrorOnPingCallsTerminate(c *C) {
+	dc, err := NewClient()
+	c.Assert(err, IsNil)
+	defer dc.Client.Close()
+
+	input := NewClientInput(testImage)
+	svc := dc.Service(input)
+	svc.Ping = func(input *PingInput) error {
+		return errors.New("Some error")
+	}
+	c.Assert(svc.Run(), ErrorMatches, "Some error")
+	c.Assert(svc.Terminate(), IsNil)
+}