Merge branch 'sheerun-shutdown'

stream_test.go

@@ -371,25 +371,16 @@ func testShutdownAfterClose(t *testing.T, fs FileSystem) {
 
 	wg := sync.WaitGroup{}
 
-	wg.Add(2)
+	wg.Add(3)
+	er := errors.New("shutdown")
 
 	go func() {
-		time.Sleep(50 * time.Millisecond)
-		_, err := ioutil.ReadAll(r)
-		if err != nil {
-			t.Error("Shutdown should allow for any already created readers to finish reading")
-		}
-		r.Close()
+		f.Write([]byte("Hello"))
+		f.Close()
+		f.ShutdownWithErr(er)
 		wg.Done()
 	}()
 
-	f.Write([]byte("Hello"))
-	f.Close()
-
-	// This waits for any reads to finish, but prevents new reads as well
-	er := errors.New("shutdown")
-	f.ShutdownWithErr(er)
-
 	go func() {
 		time.Sleep(50 * time.Millisecond)
 		_, err := f.NextReader()
@@ -399,6 +390,16 @@ func testShutdownAfterClose(t *testing.T, fs FileSystem) {
 		wg.Done()
 	}()
 
+	go func() {
+		time.Sleep(50 * time.Millisecond)
+		defer r.Close()
+		_, err := ioutil.ReadAll(r)
+		if err != nil {
+			t.Error("Shutdown should allow for any already created readers to finish reading")
+		}
+		wg.Done()
+	}()
+
 	wg.Wait()
 
 	cleanup(f, t)