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

python tests: fix format() strings for Python 2.6

Browse Source 
Python 2.6 wants "{0}".format(x), not "{}".format(x).

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall
2018-09-21 13:22:56 +12:00
committed by Andrew Bartlett
parent 3b94d31d24
commit 198bcfbac3
13 changed files with 108 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
python/samba/tests/samba_tool/computer.py
View File

@ -254,14 +254,14 @@ class ComputerCmdTestCase(SambaToolCmdTest):
return ou
def _create_computer(self, computer):
args = '{} {} --description={}'.format(
args = '{0} {1} --description={2}'.format(
computer['name'], self.creds, computer["description"])
for ip_address in computer.get('ip_address_list', []):
args += ' --ip-address={}'.format(ip_address)
args += ' --ip-address={0}'.format(ip_address)
for service_principal_name in computer.get('service_principal_name_list', []):
args += ' --service-principal-name={}'.format(service_principal_name)
args += ' --service-principal-name={0}'.format(service_principal_name)
args = args.split()
@ -290,9 +290,9 @@ class ComputerCmdTestCase(SambaToolCmdTest):
def _find_dns_record(self, name, ip_address):
name = name.rstrip('$') # computername
records = self.samdb.search(
base="DC=DomainDnsZones,{}".format(self.samdb.get_default_basedn()),
base="DC=DomainDnsZones,{0}".format(self.samdb.get_default_basedn()),
scope=ldb.SCOPE_SUBTREE,
expression="(&(objectClass=dnsNode)(name={}))".format(name),
expression="(&(objectClass=dnsNode)(name={0}))".format(name),
attrs=['dnsRecord', 'dNSTombstoned'])
# unpack data and compare