From f86c26878a098e3b64d12702e171b965bb059bf3 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Wed, 18 Nov 2020 15:28:39 -0800
Subject: [PATCH] lntest/timeouts: fix darwin+kvdb_etcd build

Currently trying to run etcd tests on darwin will cause the timeouts to
improperly select timeouts_darwin.go which are stricter than
timeouts_etcd.go. We fix this by always defaulting to timeouts_etcd.go
no matter the platform, and only falling back to timeouts_darwin.go if
the kvdb_etcd tag is not present.
---
 lntest/timeouts_darwin.go | 2 +-
 lntest/timeouts_etcd.go   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lntest/timeouts_darwin.go b/lntest/timeouts_darwin.go
index be66b67b..114f408c 100644
--- a/lntest/timeouts_darwin.go
+++ b/lntest/timeouts_darwin.go
@@ -1,4 +1,4 @@
-// +build darwin
+// +build darwin,!kvdb_etcd
 
 package lntest
 
diff --git a/lntest/timeouts_etcd.go b/lntest/timeouts_etcd.go
index 3cbf1cbc..b4e0825f 100644
--- a/lntest/timeouts_etcd.go
+++ b/lntest/timeouts_etcd.go
@@ -1,4 +1,4 @@
-// +build !darwin,kvdb_etcd
+// +build kvdb_etcd
 
 package lntest