@@ -117,3 +117,87 @@ func TestFollowLogsConsumerGone(t *testing.T) {

 		t.Fatal("timeout waiting for followLogs() to finish")

 	}

 }

+

+func TestFollowLogsProducerGone(t *testing.T) {

+	lw := logger.NewLogWatcher()

+

+	f, err := ioutil.TempFile("", t.Name())

+	assert.NilError(t, err)

+	defer os.Remove(f.Name())

+

+	var sent, received, closed int

+	makeDecoder := func(rdr io.Reader) func() (*logger.Message, error) {

+		return func() (*logger.Message, error) {

+			if closed == 1 {

+				closed++

+				t.Logf("logDecode() closed after sending %d messages\n", sent)

+				return nil, io.EOF

+			} else if closed > 1 {

+				t.Fatal("logDecode() called after closing!")

+				return nil, io.EOF

+			}

+			sent++

+			return &logger.Message{}, nil

+		}

+	}

+	var since, until time.Time

+

+	followLogsDone := make(chan struct{})

+	go func() {

+		followLogs(f, lw, make(chan interface{}), makeDecoder, since, until)

+		close(followLogsDone)

+	}()

+

+	// read 1 message

+	select {

+	case <-lw.Msg:

+		received++

+	case err := <-lw.Err:

+		assert.NilError(t, err)

+	case <-followLogsDone:

+		t.Fatal("followLogs() finished unexpectedly")

+	case <-time.After(10 * time.Second):

+		t.Fatal("timeout waiting for log message")

+	}

+

+	// "stop" the "container"

+	closed = 1

+	lw.ProducerGone()

+

+	// should receive all the messages sent

+	readDone := make(chan struct{})

+	go func() {

+		defer close(readDone)

+		for {

+			select {

+			case <-lw.Msg:

+				received++

+				if received == sent {

+					return

+				}

+			case err := <-lw.Err:

+				assert.NilError(t, err)

+			}

+		}

+	}()

+	select {

+	case <-readDone:

+	case <-time.After(30 * time.Second):

+		t.Fatalf("timeout waiting for log messages to be read (sent: %d, received: %d", sent, received)

+	}

+

+	t.Logf("messages sent: %d, received: %d", sent, received)

+

+	// followLogs() should be done by now

+	select {

+	case <-followLogsDone:

+	case <-time.After(30 * time.Second):

+		t.Fatal("timeout waiting for followLogs() to finish")

+	}

+

+	select {

+	case <-lw.WatchConsumerGone():

+		t.Fatal("consumer should not have exited")

+	default:

+	}

+}