Replace str.format() with `%` formatting
PATCH 9/9 Replace str.format() with `%` formatting
Most of Fuego python code uses the % string formatting operator instead of str.format(). In order to try to maintain a consitency throughout Fuego, we're replacing all str.format() from the release-test with %.
Signed-off-by Guilherme Campos Camargo <[email protected]>
--- .../Functional.fuego_release_test/test_run.py | 48 ++++++++++------------ 1 file changed, 21 insertions(+), 27 deletions(-)
engine/tests/Functional.fuego_release_test/test_run.py +21 -27
@@ -160,8 +160,9 @@ class ShExpect(): OUTPUT_VARIABLE = 'cmd_output' COMMAND_OUTPUT_DELIM = ':test_run_cmd_out:' COMMAND_OUTPUT_PATTERN = re.compile( - r'^{0}(.*){0}\s+{1}'.format( - COMMAND_OUTPUT_DELIM, BASH_PATTERN), re.M | re.S) + r'^%s(.*)%s\s+%s' % + (COMMAND_OUTPUT_DELIM, COMMAND_OUTPUT_DELIM, BASH_PATTERN), + re.M | re.S) def __init__(self, cmd, expected_output=None, expected_result=0): self.cmd = cmd
@@ -173,8 +174,8 @@ class ShExpect(): LOGGER.debug("Executing command '%s'", self.cmd) try: - self.client.sendline('{}=$({} 2>&1)'.format( - self.OUTPUT_VARIABLE, self.cmd)) + self.client.sendline('%s=$(%s 2>&1)' % + (self.OUTPUT_VARIABLE, self.cmd)) self.client.expect(self.BASH_PATTERN) self.client.sendline('echo $?')
@@ -182,9 +183,9 @@ class ShExpect(): result = int(self.client.match.group(1)) self.client.sendline( - 'echo "{0}${{{1}}}{0}"'.format( - self.COMMAND_OUTPUT_DELIM, - self.OUTPUT_VARIABLE)) + 'echo "%s${%s}%s"' % (self.COMMAND_OUTPUT_DELIM, + self.OUTPUT_VARIABLE, + self.COMMAND_OUTPUT_DELIM)) self.client.expect(self.COMMAND_OUTPUT_PATTERN) out = self.client.match.group(1)
@@ -268,7 +269,7 @@ class FuegoContainer: LOGGER.debug(" Not Found") mount['source'] = None - cmd = './{} {}'.format(self.install_script, self.image_name) + cmd = './%s %s' % (self.install_script, self.image_name) LOGGER.debug("Running '%s' to install the docker image. " + "This may take a while....", cmd) status = subprocess.call(cmd, shell=True)
@@ -365,8 +366,7 @@ class FuegoContainer: container_addr = self.get_ip() if container_addr: - return 'http://{}:{}/fuego/'.\ - format(container_addr, self.jenkins_port) + return 'http://%s:%s/fuego/' % (container_addr, self.jenkins_port) else: return None
@@ -381,8 +381,7 @@ class PexpectContainerSession(): LOGGER.debug( "Starting container '%s'", self.container.container_name) self.client = pexpect.spawnu( - '{} {}'.format( - self.start_script, self.container.container_name), + '%s %s' % (self.start_script, self.container.container_name), echo=False, timeout=self.timeout) PexpectContainerSession.set_ps1(self.client)
@@ -397,7 +396,7 @@ class PexpectContainerSession(): @staticmethod def set_ps1(client): - client.sendline('export PS1="{}"'.format(ShExpect.BASH_PATTERN)) + client.sendline('export PS1="%s"' % ShExpect.BASH_PATTERN) client.expect(ShExpect.BASH_PATTERN) def wait_for_jenkins(self):
@@ -500,35 +499,30 @@ def main(): parser.add_argument('working_dir', help="The working directory", type=str) parser.add_argument('-s', '--install-script', help="The script that will be used to install the " + - "docker image. Defaults to '{}'" - .format(DEFAULT_INSTALL_SCRIPT), - default=DEFAULT_INSTALL_SCRIPT, + "docker image. Defaults to '%s'" % + DEFAULT_INSTALL_SCRIPT, default=DEFAULT_INSTALL_SCRIPT, type=str) parser.add_argument('-a', '--start-script', help="The script used to start the container. " + - "Defaults to '{}'" - .format(DEFAULT_START_SCRIPT), + "Defaults to '%s'" % DEFAULT_START_SCRIPT, default=DEFAULT_START_SCRIPT, type=str) parser.add_argument('-i', '--image-name', default=DEFAULT_IMAGE_NAME, help="The image name that should be used. " + - "Defaults to '{}'" - .format(DEFAULT_IMAGE_NAME), type=str) + "Defaults to '%s'" % DEFAULT_IMAGE_NAME, type=str) parser.add_argument('-c', '--container-name', default=DEFAULT_CONTAINER_NAME, help="The container name that should be used for " + - "the test. Defaults to '{}'" - .format(DEFAULT_CONTAINER_NAME), + "the test. Defaults to '%s'" % DEFAULT_CONTAINER_NAME, type=str) parser.add_argument('-t', '--timeout', help="The timeout value for " + - "commands. Defaults to {}" - .format(DEFAULT_TIMEOUT), + "commands. Defaults to '%s'" % DEFAULT_TIMEOUT, default=DEFAULT_TIMEOUT, type=int) parser.add_argument('-j', '--jenkins-port', help="The port where the jenkins is running on the " + - "test container. Defaults to {}" - .format(DEFAULT_JENKINS_PORT), - default=DEFAULT_JENKINS_PORT, type=int) + "test container. Defaults to '%s'" % + DEFAULT_JENKINS_PORT, default=DEFAULT_JENKINS_PORT, + type=int) parser.add_argument('--no-rm-container', help="Do not remove the container after tests are " + "complete.",
Signature · 1 line
2.16.3
Thanks - applied and pushed.
-- Tim