chromeos-gfx-alerts: don't report memory to dashboard
Memory values from test other than graphics_WebGLAquarium will not
be reported as memory changes are too noisy and ill-defined outside
of measuring the browser.
BUG=chromium:717664
TEST=test_that
Change-Id: Iddeabb6562f23fe261ed49c956cfd877373faf29
Reviewed-on: https://chromium-review.googlesource.com/495115
Commit-Ready: Po-Hsien Wang <pwang@chromium.org>
Tested-by: Po-Hsien Wang <pwang@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
diff --git a/client/site_tests/graphics_GLBench/graphics_GLBench.py b/client/site_tests/graphics_GLBench/graphics_GLBench.py
index 3d9e2d0..6eced71 100644
--- a/client/site_tests/graphics_GLBench/graphics_GLBench.py
+++ b/client/site_tests/graphics_GLBench/graphics_GLBench.py
@@ -64,12 +64,7 @@
if self._services:
self._services.restore_services()
if self.GSC:
- keyvals = self.GSC.get_memory_keyvals()
- for key, val in keyvals.iteritems():
- self.output_perf_value(
- description=key, value=val, units='bytes', higher_is_better=False)
self.GSC.finalize()
- self.write_perf_keyval(keyvals)
def report_temperature(self, keyname):
"""Report current max observed temperature with given keyname.
diff --git a/client/site_tests/graphics_GLES2ConformChrome/graphics_GLES2ConformChrome.py b/client/site_tests/graphics_GLES2ConformChrome/graphics_GLES2ConformChrome.py
index 5130753..1b5b9a2 100644
--- a/client/site_tests/graphics_GLES2ConformChrome/graphics_GLES2ConformChrome.py
+++ b/client/site_tests/graphics_GLES2ConformChrome/graphics_GLES2ConformChrome.py
@@ -25,12 +25,7 @@
def cleanup(self):
super(graphics_GLES2ConformChrome, self).cleanup()
if self.GSC:
- keyvals = self.GSC.get_memory_keyvals()
- for key, val in keyvals.iteritems():
- self.output_perf_value(description=key, value=val,
- units='bytes', higher_is_better=False)
self.GSC.finalize()
- self.write_perf_keyval(keyvals)
def run_once(self):
# TODO(ihf): Remove this once GLES2ConformChrome works on freon.
diff --git a/client/site_tests/graphics_GLMark2/graphics_GLMark2.py b/client/site_tests/graphics_GLMark2/graphics_GLMark2.py
index 811ad6c..d3f5c61 100644
--- a/client/site_tests/graphics_GLMark2/graphics_GLMark2.py
+++ b/client/site_tests/graphics_GLMark2/graphics_GLMark2.py
@@ -50,15 +50,7 @@
if self._services:
self._services.restore_services()
if self.GSC:
- keyvals = self.GSC.get_memory_keyvals()
- for key, val in keyvals.iteritems():
- self.output_perf_value(
- description=key,
- value=val,
- units='bytes',
- higher_is_better=False)
self.GSC.finalize()
- self.write_perf_keyval(keyvals)
def run_once(self, size='800x600', hasty=False, min_score=None):
dep = 'glmark2'
diff --git a/client/site_tests/graphics_GpuReset/graphics_GpuReset.py b/client/site_tests/graphics_GpuReset/graphics_GpuReset.py
index 533df46..486ea16 100644
--- a/client/site_tests/graphics_GpuReset/graphics_GpuReset.py
+++ b/client/site_tests/graphics_GpuReset/graphics_GpuReset.py
@@ -115,8 +115,3 @@
# We need to wait a bit for X to come back after the 'start ui'.
time.sleep(5)
-
- keyvals = self.GSC.get_memory_keyvals()
- for key, val in keyvals.iteritems():
- self.output_perf_value(
- description=key, value=val, units='bytes', higher_is_better=False)
diff --git a/client/site_tests/graphics_KernelMemory/graphics_KernelMemory.py b/client/site_tests/graphics_KernelMemory/graphics_KernelMemory.py
index 591aa33..2ff1be3 100644
--- a/client/site_tests/graphics_KernelMemory/graphics_KernelMemory.py
+++ b/client/site_tests/graphics_KernelMemory/graphics_KernelMemory.py
@@ -24,15 +24,7 @@
# still flaky. So for now we, lame as we are, just sleep a bit.
time.sleep(10.0)
- keyvals = self.GSC.get_memory_keyvals()
- for key, val in keyvals.iteritems():
- self.output_perf_value(
- description=key,
- value=val,
- units='bytes',
- higher_is_better=False)
self.GSC.finalize()
- self.write_perf_keyval(keyvals)
# We should still be in the login screen and memory use > 0.
if self.GSC.get_memory_access_errors() > 0:
raise error.TestFail('Failed: Detected %d errors accessing graphics'
diff --git a/client/site_tests/graphics_SanAngeles/graphics_SanAngeles.py b/client/site_tests/graphics_SanAngeles/graphics_SanAngeles.py
index a6f6f29..9d340a5 100644
--- a/client/site_tests/graphics_SanAngeles/graphics_SanAngeles.py
+++ b/client/site_tests/graphics_SanAngeles/graphics_SanAngeles.py
@@ -35,15 +35,7 @@
if self._services:
self._services.restore_services()
if self.GSC:
- keyvals = self.GSC.get_memory_keyvals()
- for key, val in keyvals.iteritems():
- self.output_perf_value(
- description=key,
- value=val,
- units='bytes',
- higher_is_better=False)
self.GSC.finalize()
- self.write_perf_keyval(keyvals)
def run_once(self):
cmd_gl = os.path.join(self.srcdir, 'SanOGL')
diff --git a/client/site_tests/graphics_Stress/graphics_Stress.py b/client/site_tests/graphics_Stress/graphics_Stress.py
index 1ea8003..1c78ff2 100644
--- a/client/site_tests/graphics_Stress/graphics_Stress.py
+++ b/client/site_tests/graphics_Stress/graphics_Stress.py
@@ -35,12 +35,7 @@
def cleanup(self):
if self.GSC:
- keyvals = self.GSC.get_memory_keyvals()
- for key, val in keyvals.iteritems():
- self.output_perf_value(description=key, value=val,
- units='bytes', higher_is_better=False)
self.GSC.finalize()
- self.write_perf_keyval(keyvals)
def setup(self):
diff --git a/client/site_tests/graphics_WebGLClear/graphics_WebGLClear.py b/client/site_tests/graphics_WebGLClear/graphics_WebGLClear.py
index ea5cd7b..7807bff 100644
--- a/client/site_tests/graphics_WebGLClear/graphics_WebGLClear.py
+++ b/client/site_tests/graphics_WebGLClear/graphics_WebGLClear.py
@@ -42,15 +42,7 @@
def cleanup(self):
if self.GSC:
- keyvals = self.GSC.get_memory_keyvals()
- for key, val in keyvals.iteritems():
- self.output_perf_value(
- description=key,
- value=val,
- units='bytes',
- higher_is_better=False)
self.GSC.finalize()
- self.write_perf_keyval(keyvals)
def run_clear_test(self, browser, test_url):
"""Runs the clear test from the given url.
diff --git a/client/site_tests/graphics_WebGLManyPlanetsDeep/graphics_WebGLManyPlanetsDeep.py b/client/site_tests/graphics_WebGLManyPlanetsDeep/graphics_WebGLManyPlanetsDeep.py
index a6e1b98..aa07c7e 100644
--- a/client/site_tests/graphics_WebGLManyPlanetsDeep/graphics_WebGLManyPlanetsDeep.py
+++ b/client/site_tests/graphics_WebGLManyPlanetsDeep/graphics_WebGLManyPlanetsDeep.py
@@ -31,15 +31,7 @@
def cleanup(self):
if self.GSC:
- keyvals = self.GSC.get_memory_keyvals()
- for key, val in keyvals.iteritems():
- self.output_perf_value(
- description=key,
- value=val,
- units='bytes',
- higher_is_better=False)
self.GSC.finalize()
- self.write_perf_keyval(keyvals)
def run_many_planets_deep_test(self, browser, test_url):
"""Runs the many planets deep test from the given url.
diff --git a/client/site_tests/graphics_WebGLPerformance/graphics_WebGLPerformance.py b/client/site_tests/graphics_WebGLPerformance/graphics_WebGLPerformance.py
index 69d1196..19b0fb6 100644
--- a/client/site_tests/graphics_WebGLPerformance/graphics_WebGLPerformance.py
+++ b/client/site_tests/graphics_WebGLPerformance/graphics_WebGLPerformance.py
@@ -37,15 +37,7 @@
def cleanup(self):
if self.GSC:
- keyvals = self.GSC.get_memory_keyvals()
- for key, val in keyvals.iteritems():
- self.output_perf_value(
- description=key,
- value=val,
- units='bytes',
- higher_is_better=False)
self.GSC.finalize()
- self.write_perf_keyval(keyvals)
def run_performance_test(self, browser, test_url):
"""Runs the performance test from the given url.
