Skip to content

wwan_resource should slugify the values (Bugfix) #2056

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

Merged
pieqq merged 1 commit into from
Aug 1, 2025
Merged

wwan_resource should slugify the values (Bugfix) #2056

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
24 changes: 16 additions & 8 deletions providers/base/bin/wwan_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
# Jonathan Cave <jonathan.cave@canonical.com>
# Po-Hsu Lin <po-hsu.lin@canonical.com>

from checkbox_support.helpers.slugify import slugify
import subprocess
import argparse
import logging
import os
import subprocess
import sys
import time

import dbus
import sys
import os


TEST_IP = "8.8.8.8"
Expand Down Expand Up @@ -471,10 +471,18 @@ def invoked(self):
for m in mm.get_modem_ids():
print("mm_id: {}".format(m))
print("hw_id: {}".format(mm.get_equipment_id(m)))
print("manufacturer: {}".format(mm.get_manufacturer(m)))
print("model: {}".format(mm.get_model_name(m)))
print("firmware_revision: {}".format(mm.get_firmware_revision(m)))
print("hardware_revision: {}".format(mm.get_hardware_revision(m)))
print("manufacturer: {}".format(slugify(mm.get_manufacturer(m))))
print("model: {}".format(slugify(mm.get_model_name(m))))
print(
"firmware_revision: {}".format(
slugify(mm.get_firmware_revision(m))
)
)
print(
"hardware_revision: {}".format(
slugify(mm.get_hardware_revision(m))
)
)
print()


Expand Down
4 changes: 2 additions & 2 deletions providers/base/tests/test_wwan_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class TestResources(unittest.TestCase):

@patch("wwan_tests.MMCLI")
def test_invoked_with_mmcli(self, mock_mmcli):
mmcli_instance = Mock()
mmcli_instance = MagicMock()
mmcli_instance.get_modem_ids.return_value = ["test"]
mock_mmcli.return_value = mmcli_instance

Expand All @@ -97,7 +97,7 @@ def test_invoked_with_mmcli(self, mock_mmcli):

@patch("wwan_tests.MMDbus")
def test_invoked_with_mmdbus(self, mock_mmdbus):
mmdbus_instance = Mock()
mmdbus_instance = MagicMock()
mmdbus_instance.get_modem_ids.return_value = ["test"]
mock_mmdbus.return_value = mmdbus_instance

Expand Down
9 changes: 5 additions & 4 deletions providers/base/units/wwan/test-plan.pxu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ _description: Automated wwan tests for Snappy Ubuntu Core devices
include:
# Note these tests require snap calling snap support
wwan/detect certification-status=blocker
wwan/check-sim-present-manufacturer-model-hw_id-auto
wwan/3gpp-scan-manufacturer-model-hw_id-auto
wwan/gsm-connection-.*-auto certification-status=blocker
wwan/gsm-reconnection-.*-auto certification-status=blocker
wwan/check-sim-present-.*-auto
wwan/gsm-connection-manufacturer-model-hw_id-auto certification-status=blocker
wwan/gsm-reconnection-.*-auto certification-status=blocker
bootstrap_include:
wwan_resource

Expand All @@ -40,7 +40,8 @@ include:
after-suspend-wwan/detect
after-suspend-wwan/check-sim-present-manufacturer-model-hw_id-auto
after-suspend-wwan/3gpp-scan-manufacturer-model-hw_id-auto
after-suspend-wwan/gsm-connection-.*-auto
after-suspend-wwan/gsm-connection-manufacturer-model-hw_id-auto certification-status=blocker
after-suspend-wwan/gsm-reconnection-.*-auto certification-status=blocker
bootstrap_include:
wwan_resource

Expand Down
Loading