@@ -14,55 +14,49 @@ import (
1414
1515func TestAHostWithAnIPv4NameserverResolvesOverIPv4 (t * testing.T ) {
1616 // act
17- resolving , err := builder . HostResolving ( strings . NewReader ( "nameserver 127.0.0.53\n " ) )
17+ resolving := resolvingOf ( t , "nameserver 127.0.0.53\n " )
1818
1919 // assert
20- require .NoError (t , err )
2120 assert .Equal (t , builder.Resolving {IPv4 : true }, resolving )
2221}
2322
2423func TestAHostWithAnIPv6NameserverResolvesOverIPv6 (t * testing.T ) {
2524 // act
26- resolving , err := builder . HostResolving ( strings . NewReader ( "nameserver ::1\n " ) )
25+ resolving := resolvingOf ( t , "nameserver ::1\n " )
2726
2827 // assert
29- require .NoError (t , err )
3028 assert .Equal (t , builder.Resolving {IPv6 : true }, resolving )
3129}
3230
3331func TestANameserverNamedWithAnInterfaceCountsAsItsAddress (t * testing.T ) {
3432 // act
35- resolving , err := builder . HostResolving ( strings . NewReader ( "nameserver 192.168.1.1%eth0\n " ) )
33+ resolving := resolvingOf ( t , "nameserver 192.168.1.1%eth0\n " )
3634
3735 // assert
38- require .NoError (t , err )
3936 assert .Equal (t , builder.Resolving {IPv4 : true }, resolving )
4037}
4138
4239func TestANameserverAfterATabCounts (t * testing.T ) {
4340 // act
44- resolving , err := builder . HostResolving ( strings . NewReader ( "nameserver\t 1.1.1.1\n " ) )
41+ resolving := resolvingOf ( t , "nameserver\t 1.1.1.1\n " )
4542
4643 // assert
47- require .NoError (t , err )
4844 assert .Equal (t , builder.Resolving {IPv4 : true }, resolving )
4945}
5046
5147func TestWhatFollowsTheNameserversAddressIsIgnored (t * testing.T ) {
5248 // act
53- resolving , err := builder . HostResolving ( strings . NewReader ( "nameserver 1.1.1.1 # home router\n " ) )
49+ resolving := resolvingOf ( t , "nameserver 1.1.1.1 # home router\n " )
5450
5551 // assert
56- require .NoError (t , err )
5752 assert .Equal (t , builder.Resolving {IPv4 : true }, resolving )
5853}
5954
6055func TestTheNameserversAddressEndsAtATab (t * testing.T ) {
6156 // act
62- resolving , err := builder . HostResolving ( strings . NewReader ( "nameserver 1.1.1.1\t # home router\n " ) )
57+ resolving := resolvingOf ( t , "nameserver 1.1.1.1\t # home router\n " )
6358
6459 // assert
65- require .NoError (t , err )
6660 assert .Equal (t , builder.Resolving {IPv4 : true }, resolving )
6761}
6862
@@ -79,12 +73,21 @@ func TestAResolvConfThatCannotBeReadFails(t *testing.T) {
7973
8074func TestAHostThatNamesNoNameserverResolvesInNeitherFamily (t * testing.T ) {
8175 // act
82- resolving , err := builder . HostResolving ( strings . NewReader ( "search example.com\n options edns0\n " ) )
76+ resolving := resolvingOf ( t , "search example.com\n options edns0\n " )
8377
8478 // assert
85- require .NoError (t , err )
8679 // libslirp from 4.8 on falls back to 127.0.0.1 and ::1 here, before it
8780 // to nothing, and miso cannot tell which one QEMU runs with. A lookup
8881 // that fails at once beats one that waits for a timeout
8982 assert .Equal (t , builder.Resolving {}, resolving )
9083}
84+
85+ // resolvingOf is what a host with the resolv.conf given resolves in.
86+ func resolvingOf (t * testing.T , conf string ) builder.Resolving {
87+ t .Helper ()
88+
89+ resolving , err := builder .HostResolving (strings .NewReader (conf ))
90+ require .NoError (t , err )
91+
92+ return resolving
93+ }
0 commit comments