Skip to content

Commit

Permalink
[change] Rename file name and modify formatter properties
Browse files Browse the repository at this point in the history
  • Loading branch information
devkapilbansal committed May 26, 2022
1 parent ce13a5b commit e6b1091
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .luacheckrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ files["openwisp-monitoring/tests"]={
ignore={"Test.*"}
}

max_line_length=88
max_line_length=90
4 changes: 2 additions & 2 deletions openwisp-monitoring/files/lib/openwisp-monitoring/dhcp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ function dhcp.parse_dhcp_lease_file(path, leases)
local f = io.open(path, 'r')
if not f then return leases end
for line in f:lines() do
local expiry, mac, ip, name, id = line:match(
'(%S+)%s+(%S+)%s+(%S+)%s+(%S+)%s+(%S+)')
local expiry, mac, ip, name, id =
line:match('(%S+)%s+(%S+)%s+(%S+)%s+(%S+)%s+(%S+)')
table.insert(leases, {
expiry = tonumber(expiry),
mac = mac,
Expand Down
10 changes: 3 additions & 7 deletions openwisp-monitoring/files/lib/openwisp-monitoring/interfaces.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ local specialized_interfaces = {
end
end

local signal_file =
io.popen('mmcli --output-json -m ' .. modem .. ' --signal-get')
local signal_file = io.popen('mmcli --output-json -m ' .. modem .. ' --signal-get')
local signal = signal_file:read("*a")
signal_file:close()
if signal and pcall(cjson.decode, signal) then
Expand Down Expand Up @@ -128,8 +127,7 @@ function interfaces.get_addresses(name)
if utils.starts_with(addr, 'fe80') then
proto = 'static'
else
local ula_prefix = uci_cursor.get('network', 'globals', 'ula_prefix') or
''
local ula_prefix = uci_cursor.get('network', 'globals', 'ula_prefix') or ''
if ula_prefix then ula_prefix = ula_prefix:sub(0, 13) end
if utils.starts_with(addr, ula_prefix) then
proto = 'static'
Expand Down Expand Up @@ -169,9 +167,7 @@ function interfaces.get_interface_info(name, netjson_interface)
end
-- collect specialized info if available
local specialized_info = specialized_interfaces[interface.proto]
if specialized_info then
info.specialized = specialized_info(name, interface)
end
if specialized_info then info.specialized = specialized_info(name, interface) end
end
end
return info
Expand Down
2 changes: 1 addition & 1 deletion openwisp-monitoring/luaformat.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
column_limit: 86
column_limit: 88
indent_width: 2
tab_width: 2
continuation_indent_width: 2
Expand Down
4 changes: 2 additions & 2 deletions openwisp-monitoring/tests/test_dhcp.lua
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ function TestDhcp.test_dhcp_leases()
luaunit.assertEquals(dhcp_functions.get_dhcp_leases(), dhcp_data.leases)
luaunit.assertEquals(dhcp_functions.parse_dhcp_lease_file('/tmp/dhcp.leases', {}),
dhcp_data.leases)
luaunit.assertEquals(
dhcp_functions.parse_dhcp_lease_file('/tmp/no_dhcp.leases', {}), {})
luaunit.assertEquals(dhcp_functions.parse_dhcp_lease_file('/tmp/no_dhcp.leases', {}),
{})
end

function TestNetJSON.test_dhcp()
Expand Down
5 changes: 2 additions & 3 deletions openwisp-monitoring/tests/test_interfaces.lua
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,8 @@ end

function TestInterface.test_new_address_array()
local interface_functions = require('interfaces')
luaunit.assertEquals(interface_functions.new_address_array(
address_data.ipv4_address, address_data.eth2_interface, 'ipv4'),
address_data.address_array)
luaunit.assertEquals(interface_functions.new_address_array(address_data.ipv4_address,
address_data.eth2_interface, 'ipv4'), address_data.address_array)
end

function TestInterface.test_get_vpn_interfaces()
Expand Down
File renamed without changes.
13 changes: 5 additions & 8 deletions openwisp-monitoring/tests/test_wifi.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ TestNetJSON = {
function TestWifi.test_parse_hostapd_clients()
luaunit.assertEquals(wifi_functions.parse_hostapd_clients(wifi_data.wlan1_clients),
wifi_data.parsed_clients)
luaunit.assertEquals(wifi_functions.parse_hostapd_clients(wifi_data.wlan0_clients),
{})
luaunit.assertEquals(wifi_functions.parse_hostapd_clients(wifi_data.wlan0_clients), {})
end

function TestWifi.test_parse_iwinfo_clients()
Expand All @@ -80,12 +79,10 @@ function TestWifi.test_netjson_clients()
luaunit.assertEquals(wifi_functions.netjson_clients(wifi_data.wlan0_clients, false),
{})
-- testing iwinfo clients
luaunit.assertEquals(
wifi_functions.netjson_clients(wifi_data.mesh0_clients.results, true),
wifi_data.mesh0_parsed_clients)
luaunit.assertEquals(
wifi_functions.netjson_clients(wifi_data.mesh1_clients.results, true),
wifi_data.mesh1_parsed_clients)
luaunit.assertEquals(wifi_functions.netjson_clients(wifi_data.mesh0_clients.results,
true), wifi_data.mesh0_parsed_clients)
luaunit.assertEquals(wifi_functions.netjson_clients(wifi_data.mesh1_clients.results,
true), wifi_data.mesh1_parsed_clients)
end

function TestWifi.test_needs_inversion()
Expand Down
1 change: 1 addition & 0 deletions runtests
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ lua -lluacov test_utils.lua -v
lua -lluacov test_neighbors.lua -v
lua -lluacov test_resources.lua -v
lua -lluacov test_wifi.lua -v
lua -lluacov test_ula_prefix.lua -v

0 comments on commit e6b1091

Please sign in to comment.