Merge "Fix api-lib unittests by removing the reduntant coverage repor…

…t generation within the test class, we are already generating coverage report using subunit."

SConscript

@@ -23,6 +23,7 @@ env.Alias('controller/test', [
     'controller/src/query_engine:test',
     'controller/src/schema:test',
     'controller/src/xmpp:test',
+    'controller/src/api-lib:test',
     'controller/src/config/api-server:test',
     'controller/src/config/schema-transformer:test',
 ])

ci_unittests.json

@@ -23,6 +23,7 @@
         "scons_test_targets" : [
             "controller/src/config/svc_monitor:test",
             "controller/src/config/schema-transformer:test",
+            "controller/src/api-lib:test",
             "controller/src/config/api-server:test"
         ],
         "misc_test_targets" : [ ]

src/api-lib/SConscript

@@ -123,4 +123,6 @@ test_depends = ['/config/common/dist/cfgm_common-0.1dev.tar.gz']
 env.Depends(test_cmd, [env['TOP']+x for x in test_depends])
 env.Depends(cov_cmd, [env['TOP']+x for x in test_depends])
 
+env.Alias('test', test_cmd)
+env.Alias('controller/src/api-lib:test', test_cmd)
 env.Alias('controller/src/api-lib:coverage', cov_cmd)

src/api-lib/tests/test_common.py

@@ -4,7 +4,6 @@
 import sys
 import socket
 from pprint import pformat
-import coverage
 import fixtures
 import testtools
 from testtools import content, content_type
@@ -40,10 +39,6 @@ def _add_request_detail(self, op, url, headers=None, query_params=None,
 
     def setUp(self):
         super(TestCase, self).setUp()
-        global cov_handle
-        if not cov_handle:
-            cov_handle = coverage.coverage(source=['../../../../build/debug/api-lib/vnc_api'])
-        cov_handle.start()
         setup_flexmock()
 
         httpretty.enable()
@@ -59,8 +54,6 @@ def setUp(self):
     def tearDown(self):
         httpretty.disable()
         httpretty.reset()
-        cov_handle.stop()
-        cov_handle.report(file=open('covreport.txt', 'w'))
         super(TestCase, self).tearDown()
     # end tearDown
 # end TestCommon