Skip to content

Commit

Permalink
shorten etcd wait_for_line (~3.4 compatibility)
Browse files Browse the repository at this point in the history
Starting at ~3.4 the output is now
`embed: serving insecure client requests on 127.0.0.1:2379, this is strongly discouraged!`
so `client requests on` still matches both
  • Loading branch information
funkyHat authored and Matt Wheeler committed Nov 6, 2019
1 parent 108be25 commit 05412bd
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pifpaf/drivers/etcd.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def _setUp(self):
for i, (peer_url, client_url)
in enumerate(http_urls)),
"--initial-cluster-state", "new",
], wait_for_line="listening for client requests on")
], wait_for_line="client requests on")

endpoints = ",".join(client_url
for peer_url, client_url in http_urls)
Expand All @@ -81,7 +81,7 @@ def _setUp(self):
"--listen-peer-urls", peer_url,
"--listen-client-urls", client_url,
"--advertise-client-urls", client_url],
wait_for_line="listening for client requests on")
wait_for_line="client requests on")
endpoints = client_url

self.putenv("ETCD_PORT", str(self.port))
Expand Down

0 comments on commit 05412bd

Please sign in to comment.