Skip to content

Commit c065323

Browse files
committed
[chores] Updated list of non critical services in OpenWrt upgrader
Added openwisp-config and openwisp-monitoring to the list of non critical services which can be stopped to free up memory.
1 parent 6a43a34 commit c065323

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

openwisp_firmware_upgrader/tests/test_openwrt_upgrader.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -603,17 +603,17 @@ def test_upgrade_free_memory_success(self, exec_command, is_alive, putfo):
603603
device_fw, device_conn, upgrade_op, output, _ = self._trigger_upgrade()
604604
self.assertTrue(device_conn.is_working)
605605
self.assertEqual(upgrade_op.status, 'success')
606-
self.assertEqual(exec_command.call_count, 20)
606+
self.assertEqual(exec_command.call_count, 22)
607607
self.assertEqual(
608608
exec_command.call_args_list[5][0][0],
609609
'test -f /etc/init.d/uhttpd && /etc/init.d/uhttpd stop',
610610
)
611611
self.assertEqual(
612-
exec_command.call_args_list[12][0][0],
612+
exec_command.call_args_list[14][0][0],
613613
'test -f /etc/init.d/log && /etc/init.d/log stop',
614614
)
615615
self.assertEqual(
616-
exec_command.call_args_list[13][0][0],
616+
exec_command.call_args_list[15][0][0],
617617
'test -f /sbin/wifi && /sbin/wifi down',
618618
)
619619
self.assertEqual(putfo.call_count, 1)
@@ -646,7 +646,7 @@ def test_upgrade_free_memory_success_legacy(self, exec_command, is_alive, putfo)
646646
device_fw, device_conn, upgrade_op, output, _ = self._trigger_upgrade()
647647
self.assertTrue(device_conn.is_working)
648648
self.assertEqual(upgrade_op.status, 'success')
649-
self.assertEqual(exec_command.call_count, 22)
649+
self.assertEqual(exec_command.call_count, 24)
650650
self.assertEqual(
651651
exec_command.call_args_list[4][0][0],
652652
'cat /proc/meminfo | grep MemAvailable',
@@ -682,17 +682,17 @@ def test_upgrade_free_memory_failure(self, exec_command, is_alive, putfo):
682682
device_fw, device_conn, upgrade_op, output, _ = self._trigger_upgrade()
683683
self.assertTrue(device_conn.is_working)
684684
self.assertEqual(upgrade_op.status, 'aborted')
685-
self.assertEqual(exec_command.call_count, 26)
685+
self.assertEqual(exec_command.call_count, 30)
686686
self.assertEqual(
687-
exec_command.call_args_list[17][0][0],
687+
exec_command.call_args_list[19][0][0],
688688
'test -f /etc/init.d/uhttpd && /etc/init.d/uhttpd start',
689689
)
690690
self.assertEqual(
691-
exec_command.call_args_list[24][0][0],
691+
exec_command.call_args_list[28][0][0],
692692
'test -f /etc/init.d/log && /etc/init.d/log start',
693693
)
694694
self.assertEqual(
695-
exec_command.call_args_list[25][0][0],
695+
exec_command.call_args_list[29][0][0],
696696
'test -f /sbin/wifi && /sbin/wifi up',
697697
)
698698
self.assertEqual(putfo.call_count, 0)
@@ -723,17 +723,17 @@ def test_upgrade_free_memory_aborted(self, exec_command, is_alive, putfo):
723723
device_fw, device_conn, upgrade_op, output, _ = self._trigger_upgrade()
724724
self.assertTrue(device_conn.is_working)
725725
self.assertEqual(upgrade_op.status, 'aborted')
726-
self.assertEqual(exec_command.call_count, 27)
726+
self.assertEqual(exec_command.call_count, 31)
727727
self.assertEqual(
728-
exec_command.call_args_list[18][0][0],
728+
exec_command.call_args_list[20][0][0],
729729
'test -f /etc/init.d/uhttpd && /etc/init.d/uhttpd start',
730730
)
731731
self.assertEqual(
732-
exec_command.call_args_list[25][0][0],
732+
exec_command.call_args_list[29][0][0],
733733
'test -f /etc/init.d/log && /etc/init.d/log start',
734734
)
735735
self.assertEqual(
736-
exec_command.call_args_list[26][0][0],
736+
exec_command.call_args_list[30][0][0],
737737
'test -f /sbin/wifi && /sbin/wifi up',
738738
)
739739
self.assertEqual(putfo.call_count, 1)

openwisp_firmware_upgrader/upgraders/openwrt.py

+2
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,8 @@ def _test_connection(self):
174174
'uhttpd',
175175
'dnsmasq',
176176
'openwisp_config',
177+
'openwisp-config',
178+
'openwisp-monitoring',
177179
'cron',
178180
'rpcd',
179181
'rssileds',

0 commit comments

Comments
 (0)