From fea4b504d8deaa5448203aae13bdb6ec3e6d33d9 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 24 Jan 2019 18:38:56 +0100
Subject: vm/vmimpl: produce better error in WaitForSSH

Currently we squash VerboseError which leads to too lengthy build error titles.
Handle verbose error more carefully.
---
 vm/vmimpl/util.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'vm/vmimpl/util.go')

diff --git a/vm/vmimpl/util.go b/vm/vmimpl/util.go
index 08034450f..616ccb3ac 100644
--- a/vm/vmimpl/util.go
+++ b/vm/vmimpl/util.go
@@ -42,7 +42,7 @@ func WaitForSSH(debug bool, timeout time.Duration, addr, sshKey, sshUser, OS str
 			return nil
 		}
 		if time.Since(startTime) > timeout {
-			return fmt.Errorf("can't ssh into the instance: %v", err)
+			return &osutil.VerboseError{"can't ssh into the instance", []byte(err.Error())}
 		}
 	}
 }
-- 
cgit mrf-deployment