From b00f0aee65ab13e608aa43a049d29c861b9ed7f4 Mon Sep 17 00:00:00 2001
From: Bryan Boreham <bjboreham@gmail.com>
Date: Fri, 18 Mar 2016 19:39:52 +0000
Subject: [PATCH] Check errors on test for root namespace

---
 common/utils.go | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/common/utils.go b/common/utils.go
index da553b24..43f9477c 100644
--- a/common/utils.go
+++ b/common/utils.go
@@ -103,8 +103,14 @@ func linkToNetDev(link netlink.Link) (*NetDev, error) {
 // Lookup the weave interface of a container
 func GetWeaveNetDevs(processID int) ([]NetDev, error) {
 	// Bail out if this container is running in the root namespace
-	nsToplevel, _ := netns.GetFromPid(1)
-	nsContainr, _ := netns.GetFromPid(processID)
+	nsToplevel, err := netns.GetFromPid(1)
+	if err != nil {
+		return nil, fmt.Errorf("unable to open root namespace: %s", err)
+	}
+	nsContainr, err := netns.GetFromPid(processID)
+	if err != nil {
+		return nil, fmt.Errorf("unable to open process %d namespace: %s", processID, err)
+	}
 	if nsToplevel.Equal(nsContainr) {
 		return nil, nil
 	}