diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-04 22:05:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-04 22:05:52 +0000 |
| commit | 692bb4cafe93e98005280e8561716f9ef7e46157 (patch) | |
| tree | 27ec0e0d6c071315d39d22ef310d658a6a5c92c9 | |
| parent | 23fba70fd8c79621aae57f8bd76f5fbb60cfd5da (diff) | |
| parent | 9e53cbbe18e7aa292ed585958f18eda516e2bb84 (diff) | |
| download | nova-692bb4cafe93e98005280e8561716f9ef7e46157.tar.gz nova-692bb4cafe93e98005280e8561716f9ef7e46157.tar.xz nova-692bb4cafe93e98005280e8561716f9ef7e46157.zip | |
Merge "Standardize the coverage initializations."
| -rw-r--r-- | nova/api/openstack/compute/contrib/coverage_ext.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/nova/api/openstack/compute/contrib/coverage_ext.py b/nova/api/openstack/compute/contrib/coverage_ext.py index e151082a3..bafb6711e 100644 --- a/nova/api/openstack/compute/contrib/coverage_ext.py +++ b/nova/api/openstack/compute/contrib/coverage_ext.py @@ -118,14 +118,13 @@ class CoverageController(object): return ports def _start_coverage_telnet(self, tn, service): + data_file = os.path.join(self.data_path, + '.nova-coverage.%s' % str(service)) tn.write('import sys\n') tn.write('from coverage import coverage\n') - if self.combine: - data_file = os.path.join(self.data_path, - '.nova-coverage.%s' % str(service)) - tn.write("coverInst = coverage(data_file='%s')\n)" % data_file) - else: - tn.write('coverInst = coverage()\n') + tn.write("coverInst = coverage(data_file='%s') " + "if 'coverInst' not in locals() " + "else coverInst\n" % data_file) tn.write('coverInst.skipModules = sys.modules.keys()\n') tn.write("coverInst.start()\n") tn.write("print 'finished'\n") |