[PATCH] python indent bugfix in dns_hub.py

Isaac Boukris iboukris at gmail.com
Thu Jan 24 10:48:03 UTC 2019


On Wed, Jan 23, 2019 at 6:53 PM Jeremy Allison <jra at samba.org> wrote:
> Yeah, this is starting to look like something strange in your
> local environment.

I think I figured out what's wrong in my environment. My main sin is
building with selftest only, without developer option. Though unlike
what I thought before, it wasn't due to timing but due to not using
the right resolv.conf file. Attached patch fixes it for me, please
take a look.

Unfortunately this does not help for the gitlab issues which do seem
timing related, as I think we always use developer option on gitlab.
Also note that after pushing the retry patch to my branch (merge
request 200), I still got a failure similar to the one Metze has
described, see:

It was solved upon retrying, and I finally got the green mark.

-------------- next part --------------
From 27940e891c5127676293b36ebbd3511b0c8b6b6d Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris at gmail.com>
Date: Thu, 24 Jan 2019 12:31:27 +0200
Subject: [PATCH] dns_lookup.c: fix tests when building with selftest but
 without developer

Signed-off-by: Isaac Boukris <iboukris at gmail.com>
 libcli/dns/dns_lookup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libcli/dns/dns_lookup.c b/libcli/dns/dns_lookup.c
index 7402d443fba..f519cf66029 100644
--- a/libcli/dns/dns_lookup.c
+++ b/libcli/dns/dns_lookup.c
@@ -70,7 +70,7 @@ struct tevent_req *dns_lookup_send(TALLOC_CTX *mem_ctx,
 	if (resolv_conf_fp == NULL) {
 		const char *resolvconf = "/etc/resolv.conf";
+#if defined(DEVELOPER) || defined(ENABLE_SELFTEST)
 			const char *envvar = getenv("RESOLV_CONF");
 			if (envvar != NULL) {

More information about the samba-technical mailing list