Merge "Make sure unit-test results are handled properly." into R2.22-dev

src/config/device-manager/setup.py

@@ -2,7 +2,7 @@
 # Copyright (c) 2014 Juniper Networks, Inc. All rights reserved.
 #
 from setuptools import setup, find_packages, Command
-import os
+import os, re
 
 class RunTestsCommand(Command):
     description = "Test command to run testr in virtualenv"
@@ -13,6 +13,9 @@ def finalize_options(self):
         self.cwd = os.getcwd()
     def run(self):
         os.system('./run_tests.sh -V')
+        with open('test.log') as f:
+            if not re.search('\nOK', ''.join(f.readlines())):
+                os._exit(1)
 
 setup(
     name='device_manager',

src/config/svc-monitor/setup.py

@@ -14,6 +14,9 @@ def finalize_options(self):
         self.cwd = os.getcwd()
     def run(self):
         os.system('./run_tests.sh -V')
+        with open('test.log') as f:
+            if not re.search('\nOK', ''.join(f.readlines())):
+                os._exit(1)
 
 def requirements(filename):
     with open(filename) as f:

src/config/vnc_openstack/setup.py

@@ -2,7 +2,6 @@
 # Copyright (c) 2013 Juniper Networks, Inc. All rights reserved.
 #
 
-import os
 import os, sys, re
 
 from setuptools import setup, find_packages, Command