File 0001-skip-test-that-requires-internet-when-not-... of Package snapd

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-skip-test-that-requires-internet-when-not-present.patch of Package snapd (Revision e07edf16dbfff4cf9890a3078ccd0a14)

Currently displaying revision e07edf16dbfff4cf9890a3078ccd0a14 , Show latest

From 258ec6e27e1886a68cf9e5088675ddfdf23f987d Mon Sep 17 00:00:00 2001
From: Rafael Kitover <rkitover@gmail.com>
Date: Tue, 3 Apr 2018 16:48:55 -0400
Subject: [PATCH] skip test that requires internet when not present

In a devicestate test that requires internet access to succeed, do a
host lookup on the nonexistant dummy host to check that the error
actually indicates that there is no such DNS record and not another
error indicating connection or host issues (thanks to mvo5 for providing
the code for the check.)

Buildroot jails such as those used by OpenSUSE disable internet access.
---
 overlord/devicestate/devicestate_test.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/overlord/devicestate/devicestate_test.go b/overlord/devicestate/devicestate_test.go
index 14dde7c2a..84a03962c 100644
--- a/overlord/devicestate/devicestate_test.go
+++ b/overlord/devicestate/devicestate_test.go
@@ -25,6 +25,7 @@ import (
 	"fmt"
 	"io"
 	"io/ioutil"
+	"net"
 	"net/http"
 	"net/http/httptest"
 	"os"
@@ -775,9 +776,17 @@ func (s *deviceMgrSuite) TestDoRequestSerialErrorsOnNoHost(c *C) {
 		c.Skip("cannot run test when http proxy is in use, the error pattern is different")
 	}
 
+	const nonexistent_host = "nowhere.nowhere.test"
+
+	// check internet access
+	_, err := net.LookupHost(nonexistent_host)
+	if netErr, ok := err.(net.Error); !ok || netErr.Temporary() {
+		c.Skip("cannot run test with no internet access, the error pattern is different")
+	}
+
 	privKey, _ := assertstest.GenerateKey(testKeyLength)
 
-	nowhere := "http://nowhere.nowhere.test"
+	nowhere := "http://" + nonexistent_host
 
 	mockRequestIDURL := nowhere + requestIDURLPath
 	restore := devicestate.MockRequestIDURL(mockRequestIDURL)
-- 
2.16.3

Places

File 0001-skip-test-that-requires-internet-when-not-present.patch of Package snapd (Revision e07edf16dbfff4cf9890a3078ccd0a14)

Places