pkg/fall: make Zero and Root vars not funcs (#1367)

These can be just vars. Think that was intended as well.
This commit is contained in:
Miek Gieben 2018-01-09 22:29:19 +00:00 committed by GitHub
parent a19ea63d3a
commit cced1a4c12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 51 additions and 52 deletions

View file

@ -19,43 +19,43 @@ func TestHostsParse(t *testing.T) {
{
`hosts
`,
false, "/etc/hosts", nil, fall.Zero(),
false, "/etc/hosts", nil, fall.Zero,
},
{
`hosts /tmp`,
false, "/tmp", nil, fall.Zero(),
false, "/tmp", nil, fall.Zero,
},
{
`hosts /etc/hosts miek.nl.`,
false, "/etc/hosts", []string{"miek.nl."}, fall.Zero(),
false, "/etc/hosts", []string{"miek.nl."}, fall.Zero,
},
{
`hosts /etc/hosts miek.nl. pun.gent.`,
false, "/etc/hosts", []string{"miek.nl.", "pun.gent."}, fall.Zero(),
false, "/etc/hosts", []string{"miek.nl.", "pun.gent."}, fall.Zero,
},
{
`hosts {
fallthrough
}`,
false, "/etc/hosts", nil, fall.Root(),
false, "/etc/hosts", nil, fall.Root,
},
{
`hosts /tmp {
fallthrough
}`,
false, "/tmp", nil, fall.Root(),
false, "/tmp", nil, fall.Root,
},
{
`hosts /etc/hosts miek.nl. {
fallthrough
}`,
false, "/etc/hosts", []string{"miek.nl."}, fall.Root(),
false, "/etc/hosts", []string{"miek.nl."}, fall.Root,
},
{
`hosts /etc/hosts miek.nl 10.0.0.9/8 {
fallthrough
}`,
false, "/etc/hosts", []string{"miek.nl.", "10.in-addr.arpa."}, fall.Root(),
false, "/etc/hosts", []string{"miek.nl.", "10.in-addr.arpa."}, fall.Root,
},
}
@ -105,7 +105,7 @@ func TestHostsInlineParse(t *testing.T) {
`example.org.`,
},
},
fall.Root(),
fall.Root,
},
{
`hosts highly_unlikely_to_exist_hosts_file example.org {
@ -117,7 +117,7 @@ func TestHostsInlineParse(t *testing.T) {
`example.org.`,
},
},
fall.Zero(),
fall.Zero,
},
{
`hosts highly_unlikely_to_exist_hosts_file example.org {
@ -126,7 +126,7 @@ func TestHostsInlineParse(t *testing.T) {
}`,
true,
map[string][]string{},
fall.Root(),
fall.Root,
},
}