diff --git a/libnetwork/resolvconf/resolvconf_unix_test.go b/libnetwork/resolvconf/resolvconf_unix_test.go index 021a5849a6..7919bfdf79 100644 --- a/libnetwork/resolvconf/resolvconf_unix_test.go +++ b/libnetwork/resolvconf/resolvconf_unix_test.go @@ -270,17 +270,20 @@ func TestBuild(t *testing.T) { t.Fatal(err) } - _, err = Build(file.Name(), []string{"ns1", "ns2", "ns3"}, []string{"search1"}, []string{"opt1"}) + f, err := Build(file.Name(), []string{"ns1", "ns2", "ns3"}, []string{"search1"}, []string{"opt1"}) if err != nil { t.Fatal(err) } + const expected = "search search1\nnameserver ns1\nnameserver ns2\nnameserver ns3\noptions opt1\n" + if !bytes.Equal(f.Content, []byte(expected)) { + t.Errorf("Expected to find '%s' got '%s'", expected, f.Content) + } content, err := os.ReadFile(file.Name()) if err != nil { t.Fatal(err) } - - if expected := "search search1\nnameserver ns1\nnameserver ns2\nnameserver ns3\noptions opt1\n"; !bytes.Contains(content, []byte(expected)) { + if !bytes.Equal(content, []byte(expected)) { t.Errorf("Expected to find '%s' got '%s'", expected, content) } } @@ -292,22 +295,22 @@ func TestBuildWithZeroLengthDomainSearch(t *testing.T) { t.Fatal(err) } - _, err = Build(file.Name(), []string{"ns1", "ns2", "ns3"}, []string{"."}, []string{"opt1"}) + f, err := Build(file.Name(), []string{"ns1", "ns2", "ns3"}, []string{"."}, []string{"opt1"}) if err != nil { t.Fatal(err) } + const expected = "nameserver ns1\nnameserver ns2\nnameserver ns3\noptions opt1\n" + if !bytes.Equal(f.Content, []byte(expected)) { + t.Errorf("Expected to find '%s' got '%s'", expected, f.Content) + } content, err := os.ReadFile(file.Name()) if err != nil { t.Fatal(err) } - - if expected := "nameserver ns1\nnameserver ns2\nnameserver ns3\noptions opt1\n"; !bytes.Contains(content, []byte(expected)) { + if !bytes.Equal(content, []byte(expected)) { t.Errorf("Expected to find '%s' got '%s'", expected, content) } - if notExpected := "search ."; bytes.Contains(content, []byte(notExpected)) { - t.Errorf("Expected to not find '%s' got '%s'", notExpected, content) - } } func TestBuildWithNoOptions(t *testing.T) { @@ -317,22 +320,22 @@ func TestBuildWithNoOptions(t *testing.T) { t.Fatal(err) } - _, err = Build(file.Name(), []string{"ns1", "ns2", "ns3"}, []string{"search1"}, []string{}) + f, err := Build(file.Name(), []string{"ns1", "ns2", "ns3"}, []string{"search1"}, []string{}) if err != nil { t.Fatal(err) } + const expected = "search search1\nnameserver ns1\nnameserver ns2\nnameserver ns3\n" + if !bytes.Equal(f.Content, []byte(expected)) { + t.Errorf("Expected to find '%s' got '%s'", expected, f.Content) + } content, err := os.ReadFile(file.Name()) if err != nil { t.Fatal(err) } - - if expected := "search search1\nnameserver ns1\nnameserver ns2\nnameserver ns3\n"; !bytes.Contains(content, []byte(expected)) { + if !bytes.Equal(content, []byte(expected)) { t.Errorf("Expected to find '%s' got '%s'", expected, content) } - if notExpected := "search ."; bytes.Contains(content, []byte(notExpected)) { - t.Errorf("Expected to not find '%s' got '%s'", notExpected, content) - } } func TestFilterResolvDNS(t *testing.T) {