aboutsummaryrefslogtreecommitdiff
path: root/crosperf/settings_factory_unittest.py
diff options
context:
space:
mode:
authorZhizhou Yang <zhizhouy@google.com>2018-11-15 13:55:12 -0800
committerchrome-bot <chrome-bot@chromium.org>2018-11-16 15:10:52 -0800
commite2b0d3ef23cfdf19db4f39cb900845a35c3af82b (patch)
tree6a815bbbbe69315018bac6cc1b687bbc24d94b03 /crosperf/settings_factory_unittest.py
parent69c558b42977054d6168ad13829ebdd80ad77a7c (diff)
downloadtoolchain-utils-e2b0d3ef23cfdf19db4f39cb900845a35c3af82b.tar.gz
crosperf: Passing dso and weight to result_cache.py
To generate and collect dso sample count, this patch passes dso and weight into result_cache.py, by setting them as members of Benchmark object. Meantime, fixed all related unit tests. BUG=chromium:902785 TEST=Passed all unit tests and sample tests locally. Change-Id: I483a00d199d48fd5e77d882d7ac81bf93b6940df Reviewed-on: https://chromium-review.googlesource.com/1338344 Commit-Ready: Zhizhou Yang <zhizhouy@google.com> Tested-by: Zhizhou Yang <zhizhouy@google.com> Reviewed-by: Caroline Tice <cmtice@chromium.org>
Diffstat (limited to 'crosperf/settings_factory_unittest.py')
-rwxr-xr-xcrosperf/settings_factory_unittest.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/crosperf/settings_factory_unittest.py b/crosperf/settings_factory_unittest.py
index 1ff6a133..71482fd9 100755
--- a/crosperf/settings_factory_unittest.py
+++ b/crosperf/settings_factory_unittest.py
@@ -18,7 +18,7 @@ class BenchmarkSettingsTest(unittest.TestCase):
def test_init(self):
res = settings_factory.BenchmarkSettings('b_settings')
self.assertIsNotNone(res)
- self.assertEqual(len(res.fields), 6)
+ self.assertEqual(len(res.fields), 7)
self.assertEqual(res.GetField('test_name'), '')
self.assertEqual(res.GetField('test_args'), '')
self.assertEqual(res.GetField('iterations'), 0)
@@ -48,7 +48,7 @@ class GlobalSettingsTest(unittest.TestCase):
def test_init(self):
res = settings_factory.GlobalSettings('g_settings')
self.assertIsNotNone(res)
- self.assertEqual(len(res.fields), 25)
+ self.assertEqual(len(res.fields), 26)
self.assertEqual(res.GetField('name'), '')
self.assertEqual(res.GetField('board'), '')
self.assertEqual(res.GetField('remote'), None)
@@ -70,6 +70,7 @@ class GlobalSettingsTest(unittest.TestCase):
self.assertEqual(res.GetField('share_cache'), '')
self.assertEqual(res.GetField('results_dir'), '')
self.assertEqual(res.GetField('chrome_src'), '')
+ self.assertEqual(res.GetField('cwp_dso'), '')
class SettingsFactoryTest(unittest.TestCase):
@@ -87,12 +88,12 @@ class SettingsFactoryTest(unittest.TestCase):
b_settings = settings_factory.SettingsFactory().GetSettings(
'benchmark', 'benchmark')
self.assertIsInstance(b_settings, settings_factory.BenchmarkSettings)
- self.assertEqual(len(b_settings.fields), 6)
+ self.assertEqual(len(b_settings.fields), 7)
g_settings = settings_factory.SettingsFactory().GetSettings(
'global', 'global')
self.assertIsInstance(g_settings, settings_factory.GlobalSettings)
- self.assertEqual(len(g_settings.fields), 25)
+ self.assertEqual(len(g_settings.fields), 26)
if __name__ == '__main__':