-
-
Notifications
You must be signed in to change notification settings - Fork 183
[tests] Fixed hardcoded config_app_label and app_label in device test_admin #748
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.
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
nemesifier
merged 2 commits into
openwisp:master
from
asmodehn:config_app_label_in_monitoring_device_tests
May 8, 2026
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -43,6 +43,10 @@ class TestAdmin( | |||||
| ): | ||||||
| """Test the additions of openwisp-monitoring to DeviceAdmin""" | ||||||
|
|
||||||
| # Since TestImportExportMixin expects app_label for config app | ||||||
| app_label = Device._meta.app_label | ||||||
| config_app_label = Device._meta.app_label | ||||||
|
|
||||||
| resources_fields = TestImportExportMixin.resource_fields | ||||||
| resources_fields.append("monitoring_status") | ||||||
| app_label = "config" | ||||||
|
|
@@ -118,7 +122,7 @@ def test_device_admin(self): | |||||
| content_object=dd, | ||||||
| params={}, | ||||||
| ) | ||||||
| url = reverse("admin:config_device_change", args=[dd.pk]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[dd.pk]) | ||||||
| response = self.client.get(url) | ||||||
| self.assertContains(response, "<h2>Status</h2>") | ||||||
| self.assertContains(response, "<h2>Charts</h2>") | ||||||
|
|
@@ -189,7 +193,7 @@ def test_status_data(self): | |||||
| ) | ||||||
| data["interfaces"][2]["wireless"]["mode"] = "station" | ||||||
| self._post_data(d.id, d.key, data) | ||||||
| url = reverse("admin:config_device_change", args=[d.pk]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[d.pk]) | ||||||
| r = self.client.get(url) | ||||||
| with self.subTest("DHCP lease MAC is shown"): | ||||||
| self.assertContains(r, "f2:f1:3e:56:d2:77") | ||||||
|
|
@@ -229,7 +233,7 @@ def test_status_data(self): | |||||
| def test_status_data_contains_wifi_version(self): | ||||||
| data = self._data() | ||||||
| d = self._create_device(organization=self._create_org()) | ||||||
| url = reverse("admin:config_device_change", args=[d.pk]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[d.pk]) | ||||||
| self._post_data(d.id, d.key, data) | ||||||
| response = self.client.get(url) | ||||||
| self.assertContains( | ||||||
|
|
@@ -254,7 +258,7 @@ def test_status_data_contains_wifi_version(self): | |||||
| def test_status_data_contains_wifi_client_he_vht_ht_unknown(self): | ||||||
| data = deepcopy(self._data()) | ||||||
| d = self._create_device(organization=self._create_org()) | ||||||
| url = reverse("admin:config_device_change", args=[d.pk]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[d.pk]) | ||||||
| wireless_interface = data["interfaces"][0]["wireless"] | ||||||
| client = data["interfaces"][0]["wireless"]["clients"][0] | ||||||
|
|
||||||
|
|
@@ -329,13 +333,13 @@ def test_status_data_contains_wifi_client_he_vht_ht_unknown(self): | |||||
|
|
||||||
| def test_no_device_data(self): | ||||||
| d = self._create_device(organization=self._create_org()) | ||||||
| url = reverse("admin:config_device_change", args=[d.pk]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[d.pk]) | ||||||
| r = self.client.get(url) | ||||||
| self.assertNotContains(r, "<h2>Status</h2>") | ||||||
| self.assertNotContains(r, "AlertSettings") | ||||||
|
|
||||||
| def test_device_add_view(self): | ||||||
| url = reverse("admin:config_device_add") | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_add") | ||||||
| r = self.client.get(url) | ||||||
| self.assertNotContains(r, "AlertSettings") | ||||||
| self.assertContains( | ||||||
|
|
@@ -356,7 +360,7 @@ def test_device_disabled_organization_admin(self): | |||||
| org = device.organization | ||||||
| org.is_active = False | ||||||
| org.save() | ||||||
| url = reverse("admin:config_device_change", args=[device.pk]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[device.pk]) | ||||||
| response = self.client.get(url) | ||||||
| self.assertContains(response, "<h2>Status</h2>") | ||||||
| self.assertContains(response, "<h2>Charts</h2>") | ||||||
|
|
@@ -375,19 +379,19 @@ def test_remove_invalid_interface(self): | |||||
| d.key, | ||||||
| {"type": "DeviceMonitoring", "interfaces": [{"name": "br-lan"}]}, | ||||||
| ) | ||||||
| url = reverse("admin:config_device_change", args=[dd.pk]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[dd.pk]) | ||||||
| self.client.get(url) | ||||||
|
|
||||||
| def test_wifi_clients_admin(self): | ||||||
| dd = self.create_test_data(no_resources=True) | ||||||
| url = reverse("admin:config_device_change", args=[dd.id]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[dd.id]) | ||||||
| r1 = self.client.get(url, follow=True) | ||||||
| self.assertEqual(r1.status_code, 200) | ||||||
| self.assertContains(r1, "00:ee:ad:34:f5:3b") | ||||||
|
|
||||||
| def test_interface_properties_admin(self): | ||||||
| dd = self.create_test_data(no_resources=True) | ||||||
| url = reverse("admin:config_device_change", args=[dd.id]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[dd.id]) | ||||||
| r1 = self.client.get(url, follow=True) | ||||||
| self.assertEqual(r1.status_code, 200) | ||||||
| self.assertContains(r1, "44:d1:fa:4b:38:44") | ||||||
|
|
@@ -416,7 +420,7 @@ def test_interface_bridge_admin(self): | |||||
| ], | ||||||
| }, | ||||||
| ) | ||||||
| url = reverse("admin:config_device_change", args=[dd.id]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[dd.id]) | ||||||
| r1 = self.client.get(url, follow=True) | ||||||
| self.assertEqual(r1.status_code, 200) | ||||||
| self.assertContains(r1, "Bridge Members") | ||||||
|
|
@@ -484,7 +488,7 @@ def test_interface_mobile_admin(self): | |||||
| ], | ||||||
| }, | ||||||
| ) | ||||||
| url = reverse("admin:config_device_change", args=[d.id]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[d.id]) | ||||||
| r1 = self.client.get(url, follow=True) | ||||||
| self.assertEqual(r1.status_code, 200) | ||||||
| self.assertContains(r1, "Signal Strength (LTE)") | ||||||
|
|
@@ -495,7 +499,7 @@ def test_interface_mobile_admin(self): | |||||
| def test_uuid_bug(self): | ||||||
| dd = self.create_test_data(no_resources=True) | ||||||
| uuid = str(dd.pk).replace("-", "") | ||||||
| url = reverse("admin:config_device_change", args=[uuid]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[uuid]) | ||||||
| r = self.client.get(url) | ||||||
| self.assertContains(r, "<h2>Status</h2>") | ||||||
|
|
||||||
|
|
@@ -531,7 +535,7 @@ def test_check_inline_formset(self): | |||||
|
|
||||||
| def test_health_checks_list(self): | ||||||
| dd = self.create_test_data() | ||||||
| url = reverse("admin:config_device_change", args=[dd.pk]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[dd.pk]) | ||||||
| r = self.client.get(url) | ||||||
| self.assertNotContains(r, "<label>Health checks:</label>") | ||||||
| m = Metric.objects.filter(configuration="disk").first() | ||||||
|
|
@@ -560,7 +564,7 @@ def test_health_checks_list(self): | |||||
|
|
||||||
| def test_wifisession_inline(self): | ||||||
| device = self._create_device() | ||||||
| path = reverse("admin:config_device_change", args=[device.id]) | ||||||
| path = reverse(f"admin:{self.config_app_label}_device_change", args=[device.id]) | ||||||
|
|
||||||
| with self.subTest("Test inline absent when no WiFiSession is present"): | ||||||
| response = self.client.get(path) | ||||||
|
|
@@ -605,7 +609,7 @@ def test_check_alertsetting_inline(self): | |||||
| ) | ||||||
| ping_check.full_clean() | ||||||
| ping_check.save() | ||||||
| url = reverse("admin:config_device_change", args=[device.pk]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[device.pk]) | ||||||
| metric = self._create_general_metric( | ||||||
| name="", content_object=device, configuration="ping" | ||||||
| ) | ||||||
|
|
@@ -748,7 +752,7 @@ def test_alert_settings_inline_post(self): | |||||
| metric = self._create_general_metric( | ||||||
| name="", content_object=device, configuration="iperf3" | ||||||
| ) | ||||||
| url = reverse("admin:config_device_change", args=[device.pk]) | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_change", args=[device.pk]) | ||||||
| alertsettings = self._create_alert_settings(metric=metric) | ||||||
| test_inline_params = { | ||||||
| "name": device.name, | ||||||
|
|
@@ -863,13 +867,14 @@ def _assert_alertsettings_inline(response, operator, threshold, tolerance): | |||||
|
|
||||||
| def test_device_admin_recover_button_visibility(self): | ||||||
| self._create_device(organization=self._create_org()) | ||||||
| url = reverse("admin:config_device_changelist") | ||||||
| url = reverse(f"admin:{self.config_app_label}_device_changelist") | ||||||
| response = self.client.get(url) | ||||||
| self.assertContains( | ||||||
| response, | ||||||
| """ | ||||||
| f""" | ||||||
| <li> | ||||||
| <a href="/admin/config/device/recover/" class="recoverlink">Recover deleted Devices</a> | ||||||
| <a href="/admin/{self.config_app_label}/device/recover/" """ | ||||||
| """class="recoverlink">Recover deleted Devices</a> | ||||||
| </li> | ||||||
| """, | ||||||
| html=True, | ||||||
|
|
@@ -907,6 +912,7 @@ class TestWifiSessionAdmin( | |||||
| TestWifiClientSessionMixin, | ||||||
| TestCase, | ||||||
| ): | ||||||
| config_app_label = "config" | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this is missing right?
Suggested change
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. correct. I ll fix it asap. |
||||||
| wifi_session_app_label = WifiSession._meta.app_label | ||||||
| wifi_session_model_name = WifiSession._meta.model_name | ||||||
|
|
||||||
|
|
@@ -1051,7 +1057,9 @@ def test_deleting_device_with_wifisessions(self): | |||||
| device_data = self._save_device_data() | ||||||
| device = Device.objects.first() | ||||||
| device.deactivate() | ||||||
| path = reverse("admin:config_device_delete", args=[device_data.pk]) | ||||||
| path = reverse( | ||||||
| f"admin:{self.config_app_label}_device_delete", args=[device_data.pk] | ||||||
| ) | ||||||
| response = self.client.post(path, {"post": "yes"}, follow=True) | ||||||
| self.assertEqual(response.status_code, 200) | ||||||
| self.assertEqual(Device.objects.count(), 0) | ||||||
|
|
@@ -1076,7 +1084,9 @@ def test_wifi_client_he_vht_ht_unknown(self): | |||||
| device = Device.objects.all().first() | ||||||
|
|
||||||
| with self.subTest("Test device wifi session inline"): | ||||||
| url = reverse("admin:config_device_change", args=[device.id]) | ||||||
| url = reverse( | ||||||
| f"admin:{self.config_app_label}_device_change", args=[device.id] | ||||||
| ) | ||||||
| response = self.client.get(url) | ||||||
| self.assertContains( | ||||||
| response, | ||||||
|
|
||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: openwisp/openwisp-monitoring
Length of output: 7299
🏁 Script executed:
Repository: openwisp/openwisp-monitoring
Length of output: 4271
🌐 Web query:
Django admin URL names app_label model_name convention💡 Result:
Django admin URL names for a model follow this convention (in the
adminURL namespace):admin:{app_label}_{model_name}_changelistadmin:{app_label}_{model_name}_addadmin:{app_label}_{model_name}_change(expectsargs=(object_id,))admin:{app_label}_{model_name}_delete(expectsargs=(object_id,))admin:{app_label}_{model_name}_history(expectsargs=(object_id,))These are generated from
ModelAdmin.get_urls()usinginfo = (self.opts.app_label, self.opts.model_name)(note:model_nameis the lowercased_meta.model_name). [1]Example:
If you have a custom
AdminSite(name="custom"), passcurrent_app="custom"to reverse the URL for that specific admin instance. [2]Related: the per-app index is
admin:app_listwithkwargs={"app_label": "auth"}. [3]Sources: Django admin source/docs for
ModelAdmin.get_urls()and reversing admin URLs. [1][2][3]🏁 Script executed:
Repository: openwisp/openwisp-monitoring
Length of output: 2339
🏁 Script executed:
Repository: openwisp/openwisp-monitoring
Length of output: 2836
🏁 Script executed:
Repository: openwisp/openwisp-monitoring
Length of output: 2539
Add dynamic model name for Device admin URLs.
Django admin URLs require both
app_labelandmodel_name. While the code makesapp_labeldynamic withconfig_app_label = Device._meta.app_label, it hardcodes"device"in all reversals and path expectations:admin:{self.config_app_label}_device_change,device_changelist, and/admin/{self.config_app_label}/device/recover/. If a derived app swapsconfig.Devicewith a differently named concrete model, these will break. Addconfig_model_name = Device._meta.model_nameand use it consistently, following the same pattern already demonstrated inTestWifiSessionAdminforWifiSession._meta.model_name(lines 917, 924-925).Also applies to: 124-125, 341-341, 869-876, 914-915, 1059-1061, 1086-1088
🤖 Prompt for AI Agents