mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-17 10:58:29 -07:00
2313eda123
Merge in DNS/adguard-home from 2302-static-ip to master Closes #2302. Squashed commit of the following: commit e62b7b033861f1c55f0d06811ca005b3934ddc5b Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Dec 7 19:38:15 2020 +0300 all: format changelog commit 4127aa7630674ddcfe84f712e6c7c8d06b1cab9a Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Dec 7 19:24:53 2020 +0300 all: fix changelog typo commit f8a432056d3682facae0cdec99d7d80a5c2bd9b5 Merge: b809a866ee4383189a
Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Dec 7 19:22:27 2020 +0300 Merge branch 'master' into 2302-static-ip commit b809a866e49147354f9c6952b2f958b6b56ad873 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Dec 7 19:20:05 2020 +0300 all: log changes commit 248c35ba411af731d6eae755a901cdbc77980628 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Dec 7 18:57:15 2020 +0300 sysutil: use bufio.Scanner commit 0dc19dd5c232fbe9552a2b0d846e048274d73a74 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Dec 7 17:26:18 2020 +0300 sysutil: fix linux tests commit 91202d6763595cff187040516dd1db10a20762b7 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Dec 7 17:15:29 2020 +0300 sysutil: fix linux files commit 40fbdbb95876322ebaeef1cbdaa8e3299b83ca7e Merge: d9a43ffb69b963fc77
Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Dec 7 16:52:35 2020 +0300 Merge branch 'master' into 2302-static-ip commit d9a43ffb68a2ddbbcf185b69fc75aed139cd6919 Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Dec 7 16:49:22 2020 +0300 sysutil: add main test commit bfef89186035ab0423d23246d46511584c26534c Author: Eugene Burkov <e.burkov@adguard.com> Date: Mon Dec 7 16:21:59 2020 +0300 sysutil: improve code quality commit a5f57a373f736971fdeb0c03371da7c8138b3a82 Author: Eugene Burkov <e.burkov@adguard.com> Date: Fri Dec 4 14:14:08 2020 +0300 all: move system functionality from dhcpd package to sysutil. commit 020b51864f85a39ca80e2b4e06faeb47cf318e11 Merge: 967e111a6ab8defdb0
Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Dec 2 14:53:43 2020 +0300 Merge branch 'master' into 2302-static-ip commit 967e111a663c18b5f4a87f3ae38d076f3ab6c200 Author: Eugene Burkov <e.burkov@adguard.com> Date: Wed Dec 2 13:52:17 2020 +0300 all: improve code quality
110 lines
2.5 KiB
Go
110 lines
2.5 KiB
Go
// +build linux
|
|
|
|
package sysutil
|
|
|
|
import (
|
|
"bytes"
|
|
"testing"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
const nl = "\n"
|
|
|
|
func TestDHCPCDStaticConfig(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
data []byte
|
|
want bool
|
|
}{{
|
|
name: "has_not",
|
|
data: []byte(`#comment` + nl +
|
|
`# comment` + nl +
|
|
`interface eth0` + nl +
|
|
`static ip_address=192.168.0.1/24` + nl +
|
|
`# interface wlan0` + nl +
|
|
`static ip_address=192.168.1.1/24` + nl +
|
|
`# comment` + nl,
|
|
),
|
|
want: false,
|
|
}, {
|
|
name: "has",
|
|
data: []byte(`#comment` + nl +
|
|
`# comment` + nl +
|
|
`interface eth0` + nl +
|
|
`static ip_address=192.168.0.1/24` + nl +
|
|
`# interface wlan0` + nl +
|
|
`static ip_address=192.168.1.1/24` + nl +
|
|
`# comment` + nl +
|
|
`interface wlan0` + nl +
|
|
`# comment` + nl +
|
|
`static ip_address=192.168.2.1/24` + nl,
|
|
),
|
|
want: true,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
r := bytes.NewReader(tc.data)
|
|
has, err := dhcpcdStaticConfig(r, "wlan0")
|
|
assert.Nil(t, err)
|
|
assert.Equal(t, tc.want, has)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestIfacesStaticConfig(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
data []byte
|
|
want bool
|
|
}{{
|
|
name: "has_not",
|
|
data: []byte(`allow-hotplug enp0s3` + nl +
|
|
`#iface enp0s3 inet static` + nl +
|
|
`# address 192.168.0.200` + nl +
|
|
`# netmask 255.255.255.0` + nl +
|
|
`# gateway 192.168.0.1` + nl +
|
|
`iface enp0s3 inet dhcp` + nl,
|
|
),
|
|
want: false,
|
|
}, {
|
|
name: "has",
|
|
data: []byte(`allow-hotplug enp0s3` + nl +
|
|
`iface enp0s3 inet static` + nl +
|
|
` address 192.168.0.200` + nl +
|
|
` netmask 255.255.255.0` + nl +
|
|
` gateway 192.168.0.1` + nl +
|
|
`#iface enp0s3 inet dhcp` + nl,
|
|
),
|
|
want: true,
|
|
}}
|
|
|
|
for _, tc := range testCases {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
r := bytes.NewReader(tc.data)
|
|
has, err := ifacesStaticConfig(r, "enp0s3")
|
|
assert.Nil(t, err)
|
|
assert.Equal(t, tc.want, has)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestSetStaticIPdhcpcdConf(t *testing.T) {
|
|
dhcpcdConf := nl + `interface wlan0` + nl +
|
|
`static ip_address=192.168.0.2/24` + nl +
|
|
`static routers=192.168.0.1` + nl +
|
|
`static domain_name_servers=192.168.0.2` + nl + nl
|
|
|
|
s := updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", "192.168.0.1", "192.168.0.2")
|
|
assert.Equal(t, dhcpcdConf, s)
|
|
|
|
// without gateway
|
|
dhcpcdConf = nl + `interface wlan0` + nl +
|
|
`static ip_address=192.168.0.2/24` + nl +
|
|
`static domain_name_servers=192.168.0.2` + nl + nl
|
|
|
|
s = updateStaticIPdhcpcdConf("wlan0", "192.168.0.2/24", "", "192.168.0.2")
|
|
assert.Equal(t, dhcpcdConf, s)
|
|
}
|