qlik-oss · axelssonHakan · Mar 26, 2019 · Mar 25, 2019 · Mar 26, 2019
diff --git a/internal/reload.go b/internal/reload.go
@@ -21,12 +21,14 @@ func Reload(ctx context.Context, doc *enigma.Doc, global *enigma.Global, silent
 	// Log progress unless silent flag was passed in to the reload command
 	if !silent {
 		reloadDone := make(chan struct{})
+		loggingDone := make(chan struct{})
 		ctxWithReservedRequestID, reservedRequestID := doc.WithReservedRequestID(ctx)
 		go func() {
 			for {
 				select {
 				case <-reloadDone:
 					logProgress(ctx, global, reservedRequestID, skipTransientLogs)
+					close(loggingDone)
 					return
 				default:
 					time.Sleep(1000)
@@ -38,6 +40,7 @@ func Reload(ctx context.Context, doc *enigma.Doc, global *enigma.Global, silent
 		}()
 		reloadSuccessful, err = doc.DoReload(ctxWithReservedRequestID, 0, false, false)
 		close(reloadDone)
+		<-loggingDone
 	} else {
 		reloadSuccessful, err = doc.DoReload(ctx, 0, false, false)
 		//fetch the progress but do nothing, othwerwise we will get it for the next non silent call

diff --git a/test/corectl_integration_test.go b/test/corectl_integration_test.go
@@ -289,7 +289,7 @@ func TestCorectl(t *testing.T) {
 			} else {
 				for _, sub := range tt.expected {
 					if !strings.Contains(actual, sub) {
-						t.Fatalf("Output did not contain substring %v", sub)
+						t.Fatalf("Output did not contain substring '%v'\nReceived:\n%v", sub, actual)
 					}
 				}
 			}