diff options
| author | Ralph Boehme <slow@samba.org> | 2018-01-08 18:45:01 +0100 |
|---|---|---|
| committer | Ralph Boehme <slow@samba.org> | 2018-01-10 01:01:24 +0100 |
| commit | 53f709d6e0c9370eaf97554a9377e6d51a3b0e6b (patch) | |
| tree | 423f707dcb2e7a2377ddbd7d72debb8e3e8d791f /selftest/target | |
| parent | 0f5b1bd9e2d16702a7be674fcd4ba4328d6befc1 (diff) | |
| download | samba-53f709d6e0c9370eaf97554a9377e6d51a3b0e6b.tar.gz | |
selftest: remove second loop waiting for winbindd from wait_for_start()
A few lines above we already checked that winbindd is running.
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'selftest/target')
| -rwxr-xr-x | selftest/target/Samba3.pm | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index 0f41b0ea1c0..2c2e8f99356 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -2444,19 +2444,13 @@ sub wait_for_start($$$$$) $ret = system("SELFTEST_WINBINDD_SOCKET_DIR=" . $envvars->{SELFTEST_WINBINDD_SOCKET_DIR} . " " . Samba::bindir_path($self, "net") ." $envvars->{CONFIGURATION} sam createbuiltingroup Users"); if ($ret != 0) { print "Failed to create BUILTIN\\Users group\n"; + teardown_env($self, $envvars); return 0; } - my $count = 0; - do { - system(Samba::bindir_path($self, "net") . " $envvars->{CONFIGURATION} cache del IDMAP/SID2XID/S-1-5-32-545"); - $ret = system("SELFTEST_WINBINDD_SOCKET_DIR=" . $envvars->{SELFTEST_WINBINDD_SOCKET_DIR} . " " . Samba::bindir_path($self, "wbinfo") . " --sid-to-gid=S-1-5-32-545"); - if ($ret != 0) { - sleep(2); - } - $count++; - } while ($ret != 0 && $count < 10); - if ($count == 10) { - print "WINBINDD not reachable after 20 seconds\n"; + system(Samba::bindir_path($self, "net") . " $envvars->{CONFIGURATION} cache del IDMAP/SID2XID/S-1-5-32-545"); + $ret = system("SELFTEST_WINBINDD_SOCKET_DIR=" . $envvars->{SELFTEST_WINBINDD_SOCKET_DIR} . " " . Samba::bindir_path($self, "wbinfo") . " --sid-to-gid=S-1-5-32-545"); + if ($ret != 0) { + print "Missing \"BUILTIN\\Users\", did net sam createbuiltingroup Users fail?\n"; teardown_env($self, $envvars); return 0; } |