From 876f66bbe9f30e48a45208a627dfd50e2a68ec22 Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@tomclegg.ca>
Date: Tue, 23 Jun 2020 11:13:17 -0400
Subject: [PATCH] 15348: Fix test suite crash after skipping docker tests.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>
---
 lib/pam/docker_test.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/pam/docker_test.go b/lib/pam/docker_test.go
index 196a452449..eb139f145f 100644
--- a/lib/pam/docker_test.go
+++ b/lib/pam/docker_test.go
@@ -95,8 +95,12 @@ Auth-Initial:
 }
 
 func (s *DockerSuite) TearDownSuite(c *check.C) {
-	s.proxysrv.Close()
-	s.proxyln.Close()
+	if s.proxysrv != nil {
+		s.proxysrv.Close()
+	}
+	if s.proxyln != nil {
+		s.proxyln.Close()
+	}
 }
 
 func (s *DockerSuite) runTestClient(c *check.C, args ...string) (stdout, stderr *bytes.Buffer, err error) {
-- 
2.30.2