sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-04 08:22:08 +03:00
Code Activity

s4-selftest: silence warnings about bind chown

Browse Source
This commit is contained in:
Andrew Tridgell
2010-10-02 14:21:52 -07:00
parent 3bb59255bb
commit 29e1a847dd
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source4/scripting/python/samba/provision.py
View File

@ -1672,7 +1672,7 @@ def provision(setup_dir, logger, session_info,
os.chmod(dns_keytab_path, 0640) os.chmod(dns_keytab_path, 0640)
os.chown(dns_keytab_path, -1, paths.bind_gid) os.chown(dns_keytab_path, -1, paths.bind_gid)
except OSError: except OSError:
if os.environ.get('UID_WRAPPER'): if not os.environ.has_key('SAMBA_SELFTEST'):
logger.info("Failed to chown %s to bind gid %u", dns_keytab_path, logger.info("Failed to chown %s to bind gid %u", dns_keytab_path,
paths.bind_gid) paths.bind_gid)
@ -1827,7 +1827,7 @@ def create_zone_file(lp, logger, paths, targetdir, setup_path, dnsdomain,
os.chmod(dns_dir, 0775) os.chmod(dns_dir, 0775)
os.chmod(paths.dns, 0664) os.chmod(paths.dns, 0664)
except OSError: except OSError:
if os.environ.get('UID_WRAPPER'): if not os.environ.has_key('SAMBA_SELFTEST'):
logger.error("Failed to chown %s to bind gid %u" % (dns_dir, paths.bind_gid)) logger.error("Failed to chown %s to bind gid %u" % (dns_dir, paths.bind_gid))
if targetdir is None: if targetdir is None:

2
source4/selftest/wscript
View File

@ -78,6 +78,8 @@ def cmd_testonly(opt):
print("ERROR: You must use --enable-selftest to enable selftest") print("ERROR: You must use --enable-selftest to enable selftest")
sys.exit(1) sys.exit(1)
os.environ['SAMBA_SELFTEST'] = '1'
env.TESTS = Options.options.TESTS env.TESTS = Options.options.TESTS
env.SUBUNIT_FORMATTER = '${PYTHON} -u ../selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate' env.SUBUNIT_FORMATTER = '${PYTHON} -u ../selftest/format-subunit --prefix=${SELFTEST_PREFIX} --immediate'