Attachment 13277 Details for Bug 12843 – patch for master

[patch] patch for master

winbind-to-start.patch.txt (text/plain), 2.17 KB, created by Andrew Bartlett on 2017-06-15 04:27:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2017-06-15 04:27:13 UTC

Size: 2.17 KB

patch

obsolete

>From 2db9a0ed6be5bb5e582d67cfa0b64c863407ad87 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Thu, 15 Jun 2017 16:19:17 +1200
>Subject: [PATCH 1/2] selftest: Correctly print message when nbt is not up in
> 20 seconds
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12843
>---
> selftest/target/Samba4.pm | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
>index 316ef8346d9..c52c99b1759 100755
>--- a/selftest/target/Samba4.pm
>+++ b/selftest/target/Samba4.pm
>@@ -207,7 +207,7 @@ sub wait_for_start($$)
> 		}
> 		$count++;
> 	} while ($ret != 0 && $count < 20);
>-	if ($count == 10) {
>+	if ($count == 20) {
> 		warn("nbt not reachable after 20 retries\n");
> 		teardown_env($self, $testenv_vars);
> 		return 0;
>-- 
>2.11.0
>
>
>From fcc5b2bee12155ae455cfa18341c61f519ebff16 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Thu, 15 Jun 2017 16:20:11 +1200
>Subject: [PATCH 2/2] selftest: Also wait for winbindd to start
>
>This ensures that the posixacl.py test does not race against winbindd starting up and so
>give wrong mappings
>
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12843
>---
> selftest/target/Samba4.pm | 18 ++++++++++++++++++
> 1 file changed, 18 insertions(+)
>
>diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm
>index c52c99b1759..2ad8dff48fd 100755
>--- a/selftest/target/Samba4.pm
>+++ b/selftest/target/Samba4.pm
>@@ -245,6 +245,24 @@ sub wait_for_start($$)
> 			sleep(1);
> 		}
> 	}
>+	
>+	my $wbinfo =  Samba::bindir_path($self, "wbinfo");
>+
>+	$count = 0;
>+	do {
>+	        $ret = system("NSS_WRAPPER_PASSWD=$testenv_vars->{NSS_WRAPPER_PASSWD} NSS_WRAPPER_GROUP=$testenv_vars->{NSS_WRAPPER_GROUP} SELFTEST_WINBINDD_SOCKET_DIR=$testenv_vars->{SELFTEST_WINBINDD_SOCKET_DIR} $wbinfo -p");
>+	    
>+		if ($ret != 0) {
>+			sleep(1);
>+		}
>+		$count++;
>+	} while ($ret != 0 && $count < 20);
>+	if ($count == 20) {
>+		warn("winbind not reachable after 20 retries\n");
>+		teardown_env($self, $testenv_vars);
>+		return 0;
>+	}
>+
> 	print $self->getlog_env($testenv_vars);
> 
> 	return $ret
>-- 
>2.11.0
>

Actions: View

Attachments on bug 12843: 13277 | 13315