From 93590f036f040bdae1af2f1994a1a0eb35a65563 Mon Sep 17 00:00:00 2001
From: Troy Ronda <troy@troyronda.com>
Date: Thu, 12 Jul 2018 14:13:40 -0400
Subject: [PATCH] [FAB-11137] Include dependencies of test imports

This change includes TestImports when calculating dependencies.

Change-Id: Ifd86a913cb9d0ee8a055a39ef9d332b7bc6b7efa
Signed-off-by: Troy Ronda <troy@troyronda.com>
---
 test/scripts/lib/find_packages.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/scripts/lib/find_packages.sh b/test/scripts/lib/find_packages.sh
index a468964faf..28f0c71018 100644
--- a/test/scripts/lib/find_packages.sh
+++ b/test/scripts/lib/find_packages.sh
@@ -151,13 +151,24 @@ function writePkgDeps {
     declare pkg=${1}
     declare key="PKGDEPS__${pkg//[-\.\/]/_}"
 
-    declare -a depsAndImports=($(${GO_CMD} list -f '{{.TestImports}} {{.Deps}}' ${pkg} | tr -d '[]' | xargs | tr ' ' '\n' | \
+    declare -a testImports=($(${GO_CMD} list -f '{{.TestImports}}' ${pkg} | tr -d '[]' | xargs | tr ' ' '\n' | \
         grep "^${REPO}" | \
         grep -v "^${REPO}/vendor/" | \
         sort -u | \
         tr '\n' ' '))
 
-    echo "${depsAndImports[@]}" > ${PKG_DEPS_DIR}/${key}.txt
+    declare -a depsAndImports=($(${GO_CMD} list -f '{{.Deps}}' ${pkg} ${testImports[@]} | tr -d '[]' | xargs | tr ' ' '\n' | \
+        grep "^${REPO}" | \
+        grep -v "^${REPO}/vendor/" | \
+        sort -u | \
+        tr '\n' ' ') ${testImports[@]})
+
+    declare val=""
+    if [ ${#depsAndImports[@]} -gt 0 ]; then
+        val=$(echo ${depsAndImports[@]} | tr ' ' '\n' | sort -u | tr '\n' ' ')
+    fi
+
+    echo "${val}" > ${PKG_DEPS_DIR}/${key}.txt
 }
 
 function evalPkgDeps {