From 2ca70c03eb860e67741d3739c306e8a4cb986436 Mon Sep 17 00:00:00 2001
From: sfalexrog <sfalexrog@gmail.com>
Date: Sat, 23 Feb 2019 23:16:22 +0300
Subject: [PATCH] builder: Re-enable loading cv2 in tests

---
 builder/image-software.sh | 4 ++--
 builder/test/tests.py     | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/builder/image-software.sh b/builder/image-software.sh
index ec5bc3c9..3f7fff1c 100755
--- a/builder/image-software.sh
+++ b/builder/image-software.sh
@@ -150,7 +150,7 @@ EOF
 echo_stamp "Attempting to kill dirmngr"
 gpgconf --kill dirmngr
 # dirmngr is only used by apt-key, so we can safely kill it.
-# We ignore killall's exit value as well.
-killall -w -9 dirmngr || true
+# We ignore pkill's exit value as well.
+pkill -9 -f dirmngr || true
 
 echo_stamp "End of software installation"
diff --git a/builder/test/tests.py b/builder/test/tests.py
index bcb0a2f1..3d427edc 100755
--- a/builder/test/tests.py
+++ b/builder/test/tests.py
@@ -5,8 +5,8 @@
 import rospy
 from geometry_msgs.msg import PoseStamped
 
-#import cv2  # TODO - fix "NEON - NOT AVAILABLE" error
-#import cv2.aruco
+import cv2  # TODO - fix "NEON - NOT AVAILABLE" error
+import cv2.aruco
 
 import numpy
 import mavros
@@ -25,3 +25,6 @@ import pymavlink
 from pymavlink import mavutil
 import rpi_ws281x
 import pigpio
+
+print cv2.getBuildInformation()
+