Skip to content

Commit 4e819b6

Browse files
committed
t: fix tests after removing python warnings
1 parent eb41857 commit 4e819b6

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

script/cfg.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -301,34 +301,34 @@ def pre_openqa_call_start(repos):
301301

302302
def openqa_call_start_iso(checksum):
303303
if checksum:
304-
return r''' [ -z "$destiso" ] || echo \" ISO=${destiso} \\\\
305-
CHECKSUM_ISO=\$(cut -b-64 /var/lib/openqa/factory/other/${destiso}.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \\\\
306-
ASSET_256=${destiso}.sha256 \\\\\"'''
304+
return r''' [ -z "$destiso" ] || echo " ISO=${destiso} \\
305+
CHECKSUM_ISO=\$(cut -b-64 /var/lib/openqa/factory/other/${destiso}.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \\
306+
ASSET_256=${destiso}.sha256 \\"'''
307307
return ''' [ -z "$destiso]" || echo \" ISO=${destiso} \\\\
308308
ASSET_256=${destiso}.sha256 \\\\\"'''
309309

310310
def openqa_call_start_ex1(checksum, tag):
311311
res = tag + '=${destiso} \\\\'
312312
if checksum:
313313
res += '''
314-
CHECKSUM_''' + tag + r'''=\$(cut -b-64 /var/lib/openqa/factory/other/${destiso}.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \\\\
315-
ASSET_256=${destiso}.sha256 \\\\'''
314+
CHECKSUM_''' + tag + r'''=\$(cut -b-64 /var/lib/openqa/factory/other/${destiso}.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \\
315+
ASSET_256=${destiso}.sha256 \\'''
316316
return res
317317

318318

319319
def openqa_call_start_ex(checksum):
320320
return r''' if [[ ${norsync_filter[$filter]} == 1 ]]; then
321321
:
322322
elif [[ $destiso =~ \.iso$ ]]; then
323-
echo \" ''' + openqa_call_start_ex1(checksum, 'ISO') + r'''\"
323+
echo " ''' + openqa_call_start_ex1(checksum, 'ISO') + r'''"
324324
elif [[ $destiso =~ \.spdx.json$ ]]; then
325-
echo \" ''' + openqa_call_start_ex1(checksum, 'ISO') + r'''\"
325+
echo " ''' + openqa_call_start_ex1(checksum, 'ISO') + r'''"
326326
elif [[ $destiso =~ \.tar$ ]]; then
327-
echo \" ''' + openqa_call_start_ex1(checksum, 'ISO') + r'''\"
327+
echo " ''' + openqa_call_start_ex1(checksum, 'ISO') + r'''"
328328
elif [[ $destiso =~ \.(hdd|qcow2|raw|raw\.xz|raw\.gz|vhdx\.xz|vmdk|vmdk\.xz)$ ]]; then
329-
echo \" ''' + openqa_call_start_ex1(checksum, 'HDD_1') + r'''\"
329+
echo " ''' + openqa_call_start_ex1(checksum, 'HDD_1') + r'''"
330330
elif [ -n "$destiso" ]; then
331-
echo \" ''' + openqa_call_start_ex1(checksum, 'ASSET_1') + r'''\"
331+
echo " ''' + openqa_call_start_ex1(checksum, 'ASSET_1') + r'''"
332332
fi
333333
'''
334334

@@ -343,13 +343,13 @@ def openqa_call_start_ex(checksum):
343343
fi
344344
done
345345
n=$((i++))
346-
echo " ASSET_$((n+255))=$src.sha256 \\\\"
346+
echo " ASSET_$((n+255))=$src.sha256 \\"
347347
if [[ $src =~ .iso$ ]]; then
348-
echo " ISO=$src \\\\"
349-
echo " CHECKSUM_ISO=\$(cut -b-64 /var/lib/openqa/factory/other/$src.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \\\\"
348+
echo " ISO=$src \\"
349+
echo " CHECKSUM_ISO=\$(cut -b-64 /var/lib/openqa/factory/other/$src.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \\"
350350
else
351-
echo " HDD_$n=$src \\\\"
352-
echo " CHECKSUM_HDD_$n=\$(cut -b-64 /var/lib/openqa/factory/other/$src.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \\\\"
351+
echo " HDD_$n=$src \\"
352+
echo " CHECKSUM_HDD_$n=\$(cut -b-64 /var/lib/openqa/factory/other/$src.sha256 | grep -E '[0-9a-f]{5,40}' | head -n1) \\"
353353
fi
354354
done < <(grep ${arch} __envsub/files_iso.lst | sort)
355355
'''

0 commit comments

Comments
 (0)