From 8578d7ab800e7970f7675217901e34eedd09f5ae Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Tue, 9 Jul 2019 22:30:40 +0000
Subject: [PATCH 1/3] etcd: 3.3.1 -> 3.3.13

While I would've liked to keep them, the release branch drops the tools
directory as of v3.3.4, seemingly without explanation:
https://github.com/etcd-io/etcd/commit/074e4177707f4daead816c108a06980d77d0aad0

master appears to contain them, so they might return at some point.
---
 pkgs/servers/etcd/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix
index d6b71f816083..d3c5555fa6ad 100644
--- a/pkgs/servers/etcd/default.nix
+++ b/pkgs/servers/etcd/default.nix
@@ -4,7 +4,7 @@ with lib;
 
 buildGoPackage rec {
   name = "etcd-${version}";
-  version = "3.3.1"; # After updating check that nixos tests pass
+  version = "3.3.13"; # After updating check that nixos tests pass
   rev = "v${version}";
 
   goPackagePath = "github.com/coreos/etcd";
@@ -13,15 +13,12 @@ buildGoPackage rec {
     inherit rev;
     owner = "coreos";
     repo = "etcd";
-    sha256 = "11gzmi05y4kpnzgqc737l0wk5svxai4z17nl92jazqga6zhyavyl";
+    sha256 = "1kac4qfr83f2hdz35403f1ald05wc85vvhw79vxb431n61jvyaqy";
   };
 
   subPackages = [
     "cmd/etcd"
     "cmd/etcdctl"
-    "cmd/tools/benchmark"
-    "cmd/tools/etcd-dump-db"
-    "cmd/tools/etcd-dump-logs"
   ];
 
   buildInputs = [ libpcap ];

From 950d91cc9cc994cfa0009ab21442b643ced5d986 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Tue, 9 Jul 2019 23:46:21 +0000
Subject: [PATCH 2/3] nixos/tests: include the etcd-cluster test in
 all-tests.nix

We seem to have had this test for quite a while, but nothing seems to
reference it.
---
 nixos/tests/all-tests.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 2f527bfa090d..665a75e47dad 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -77,6 +77,7 @@ in
   elk = handleTestOn ["x86_64-linux"] ./elk.nix {};
   env = handleTest ./env.nix {};
   etcd = handleTestOn ["x86_64-linux"] ./etcd.nix {};
+  etcd-cluster = handleTestOn ["x86_64-linux"] ./etcd-cluster.nix {};
   ferm = handleTest ./ferm.nix {};
   firefox = handleTest ./firefox.nix {};
   firewall = handleTest ./firewall.nix {};

From b3bce2cfa2dc9929d8c24989b800e1a10e1a64f3 Mon Sep 17 00:00:00 2001
From: edef <edef@edef.eu>
Date: Wed, 10 Jul 2019 00:42:48 +0000
Subject: [PATCH 3/3] nixos/tests/etcd-cluster: be more lenient about member
 addition

---
 nixos/tests/etcd-cluster.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/etcd-cluster.nix b/nixos/tests/etcd-cluster.nix
index 3c4de5950a79..43fde7d59205 100644
--- a/nixos/tests/etcd-cluster.nix
+++ b/nixos/tests/etcd-cluster.nix
@@ -140,7 +140,7 @@ in {
     };
 
     subtest "should add another member", sub {
-      $node1->succeed("etcdctl member add node3 https://node3:2380");
+      $node1->waitUntilSucceeds("etcdctl member add node3 https://node3:2380");
       $node3->start();
       $node3->waitForUnit("etcd.service");
       $node3->waitUntilSucceeds("etcdctl member list | grep 'node3'");