Merge pull request #1077 from c-po/configtests

smoketest: T8087: bugfix missing f-ormat string indicator

1 files changed, 12 insertions, 11 deletions

diff --git a/scripts/check-qemu-install b/scripts/check-qemu-install
index 027deb16..b2ebe750 100755
--- a/scripts/check-qemu-install
+++ b/scripts/check-qemu-install
@@ -32,7 +32,6 @@
 #    [--silent]     only print on errors
 #    [--debug]      print all communication with the device
 
-import pexpect
 import sys
 import os
 import time
@@ -42,13 +41,15 @@ import random
 import traceback
 import logging
 import re
-import tomli
 import shutil
 import json
 
 from io import BytesIO
 from datetime import datetime
 
+import tomli
+import pexpect
+
 EXCEPTION = 0
 now = datetime.now()
 tpm_folder = '/tmp/vyos_tpm_test'
@@ -310,10 +311,10 @@ def start_swtpm():
         os.mkdir(tpm_folder)
 
     def swtpm_thread():
-        c = subprocess.check_output([
-                'swtpm', 'socket', '--tpmstate', f'dir={tpm_folder}',
-                '--ctrl', f'type=unixio,path={tpm_folder}/swtpm-sock', '--tpm2', '--log', 'level=1'
-            ])
+        subprocess.check_output([
+            'swtpm', 'socket', '--tpmstate', f'dir={tpm_folder}',
+            '--ctrl', f'type=unixio,path={tpm_folder}/swtpm-sock', '--tpm2', '--log', 'level=1'
+        ])
 
     from multiprocessing import Process
     tpm_process = Process(target=swtpm_thread)
@@ -921,11 +922,11 @@ try:
             c.expect(op_mode_prompt)
         if args.no_interfaces:
             # remove interface tests as they consume a lot of time
-            c.sendline('sudo rm -f {smoketests_path}/cli/test_interfaces_*')
+            c.sendline(f'sudo rm -f {smoketests_path}/cli/test_interfaces_*')
             c.expect(op_mode_prompt)
         if args.no_vpp:
             # remove VPP tests
-            c.sendline('sudo rm -f {smoketests_path}/cli/test_vpp*')
+            c.sendline(f'sudo rm -f {smoketests_path}/cli/test_vpp*')
             c.expect(op_mode_prompt)
 
         if args.vyconf:
@@ -940,9 +941,9 @@ try:
 
         if i == 0:
             raise Exception('Invalid command detected')
-        elif i == 1:
+        if i == 1:
             raise Exception('Set syntax failed :/')
-        elif i == 2:
+        if i == 2:
             tmp = '(W)hy (T)he (F)ace? VyOS smoketest not found!'
             log.error(tmp)
             raise Exception(tmp)
@@ -989,7 +990,7 @@ try:
         c.expect(op_mode_prompt)
 
         log.info('Generating PKI objects')
-        c.sendline(f'/usr/bin/vyos-configtest-pki')
+        c.sendline('/usr/bin/vyos-configtest-pki')
         c.expect(op_mode_prompt, timeout=900)
 
         script_file = '/config/scripts/vyos-foo-update.script'