Skip to content

[fix] Remove invalid escape sequence warnings in OpenWrt strings #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yassinekolsi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[fix] Remove invalid escape sequence warnings in OpenWrt strings #403

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions openwisp_firmware_upgrader/tests/test_openwrt_upgrader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,10 @@ def mocked_exec_upgrade_success_false_positives(
filename = command.split()[-1].split("/")[-1]
raise CommandFailedException(
"Command failed: ubus call system sysupgrade "
'{ "prefix": "\/tmp\/root", '
f'"path": "\/tmp\/{filename}", '
'"backup": "\/tmp\/sysupgrade.tgz", '
'"command": "\/lib\/upgrade\/do_stage2", '
'{ "prefix": "/tmp/root", '
f'"path": "/tmp/{filename}", '
'"backup": "/tmp/sysupgrade.tgz", '
'"command": "/lib/upgrade/do_stage2", '
'"options": { "save_partitions": 1 } } '
"(Connection failed)"
)
Expand Down
14 changes: 7 additions & 7 deletions openwisp_firmware_upgrader/upgraders/openwrt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ class OpenWrt(object):

_false_positives = [
"Command failed: ubus call system sysupgrade "
'\{ "prefix": "\\\/tmp\\\/root", "path": "[^"]*", '
'"backup": "\\\/tmp\\\/sysupgrade.tgz", '
'"command": "\\\/lib\\\/upgrade\\\/do_stage2", '
'"options": \{ "save_partitions": 1 \} \}',
r'\{ "prefix": "\\?/tmp\\?/root", "path": "[^"]*", '
r'"backup": "\\?/tmp\\?/sysupgrade.tgz", '
r'"command": "\\?/lib\\?/upgrade\\?/do_stage2", '
r'"options": \{ "save_partitions": 1 \} \}',
"Command failed: ubus call system sysupgrade "
'\{ "prefix": "\\\/tmp\\\/root", "path": "[^"]*", '
'"command": "\\\/lib\\\/upgrade\\\/do_stage2", '
'"options": \{ "save_partitions": 1 \} \}',
r'\{ "prefix": "\\?/tmp\\?/root", "path": "[^"]*", '
r'"command": "\\?/lib\\?/upgrade\\?/do_stage2", '
r'"options": \{ "save_partitions": 1 \} \}',
]

def __init__(self, upgrade_operation, connection):
Expand Down
Loading