Browse Source

libnetwork: fix some whitespace formatting

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Sebastiaan van Stijn 2 years ago
parent
commit
50a7c67363
2 changed files with 10 additions and 16 deletions
  1. 6 6
      libnetwork/libnetwork_linux_test.go
  2. 4 10
      libnetwork/sandbox_dns_windows.go

+ 6 - 6
libnetwork/libnetwork_linux_test.go

@@ -618,12 +618,12 @@ func TestEnableIPv6(t *testing.T) {
 
 
 	tmpResolvConf := []byte("search pommesfrites.fr\nnameserver 12.34.56.78\nnameserver 2001:4860:4860::8888\n")
 	tmpResolvConf := []byte("search pommesfrites.fr\nnameserver 12.34.56.78\nnameserver 2001:4860:4860::8888\n")
 	expectedResolvConf := []byte("search pommesfrites.fr\nnameserver 127.0.0.11\nnameserver 2001:4860:4860::8888\noptions ndots:0\n")
 	expectedResolvConf := []byte("search pommesfrites.fr\nnameserver 127.0.0.11\nnameserver 2001:4860:4860::8888\noptions ndots:0\n")
-	//take a copy of resolv.conf for restoring after test completes
+	// take a copy of resolv.conf for restoring after test completes
 	resolvConfSystem, err := os.ReadFile("/etc/resolv.conf")
 	resolvConfSystem, err := os.ReadFile("/etc/resolv.conf")
 	if err != nil {
 	if err != nil {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}
-	//cleanup
+	// cleanup
 	defer func() {
 	defer func() {
 		if err := os.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
 		if err := os.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
 			t.Fatal(err)
 			t.Fatal(err)
@@ -696,12 +696,12 @@ func TestResolvConfHost(t *testing.T) {
 
 
 	tmpResolvConf := []byte("search localhost.net\nnameserver 127.0.0.1\nnameserver 2001:4860:4860::8888\n")
 	tmpResolvConf := []byte("search localhost.net\nnameserver 127.0.0.1\nnameserver 2001:4860:4860::8888\n")
 
 
-	//take a copy of resolv.conf for restoring after test completes
+	// take a copy of resolv.conf for restoring after test completes
 	resolvConfSystem, err := os.ReadFile("/etc/resolv.conf")
 	resolvConfSystem, err := os.ReadFile("/etc/resolv.conf")
 	if err != nil {
 	if err != nil {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}
-	//cleanup
+	// cleanup
 	defer func() {
 	defer func() {
 		if err := os.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
 		if err := os.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
 			t.Fatal(err)
 			t.Fatal(err)
@@ -779,12 +779,12 @@ func TestResolvConf(t *testing.T) {
 	expectedResolvConf1 := []byte("search pommesfrites.fr\nnameserver 127.0.0.11\noptions ndots:0\n")
 	expectedResolvConf1 := []byte("search pommesfrites.fr\nnameserver 127.0.0.11\noptions ndots:0\n")
 	tmpResolvConf3 := []byte("search pommesfrites.fr\nnameserver 113.34.56.78\n")
 	tmpResolvConf3 := []byte("search pommesfrites.fr\nnameserver 113.34.56.78\n")
 
 
-	//take a copy of resolv.conf for restoring after test completes
+	// take a copy of resolv.conf for restoring after test completes
 	resolvConfSystem, err := os.ReadFile("/etc/resolv.conf")
 	resolvConfSystem, err := os.ReadFile("/etc/resolv.conf")
 	if err != nil {
 	if err != nil {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}
-	//cleanup
+	// cleanup
 	defer func() {
 	defer func() {
 		if err := os.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
 		if err := os.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
 			t.Fatal(err)
 			t.Fatal(err)

+ 4 - 10
libnetwork/sandbox_dns_windows.go

@@ -9,27 +9,21 @@ import (
 
 
 // Stub implementations for DNS related functions
 // Stub implementations for DNS related functions
 
 
-func (sb *sandbox) startResolver(bool) {
-}
+func (sb *sandbox) startResolver(bool) {}
 
 
 func (sb *sandbox) setupResolutionFiles() error {
 func (sb *sandbox) setupResolutionFiles() error {
 	return nil
 	return nil
 }
 }
 
 
-func (sb *sandbox) restorePath() {
-}
+func (sb *sandbox) restorePath() {}
 
 
 func (sb *sandbox) updateHostsFile(ifaceIP []string) error {
 func (sb *sandbox) updateHostsFile(ifaceIP []string) error {
 	return nil
 	return nil
 }
 }
 
 
-func (sb *sandbox) addHostsEntries(recs []etchosts.Record) {
-
-}
-
-func (sb *sandbox) deleteHostsEntries(recs []etchosts.Record) {
+func (sb *sandbox) addHostsEntries(recs []etchosts.Record) {}
 
 
-}
+func (sb *sandbox) deleteHostsEntries(recs []etchosts.Record) {}
 
 
 func (sb *sandbox) updateDNS(ipv6Enabled bool) error {
 func (sb *sandbox) updateDNS(ipv6Enabled bool) error {
 	return nil
 	return nil