Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(416)

Unified Diff: tools/telemetry/telemetry/core/chrome/inspector_runtime_unittest.py

Issue 12278015: [Telemetry] Reorganize everything. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Re-add shebangs. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/telemetry/telemetry/core/chrome/inspector_runtime_unittest.py
diff --git a/tools/telemetry/telemetry/inspector_runtime_unittest.py b/tools/telemetry/telemetry/core/chrome/inspector_runtime_unittest.py
similarity index 81%
rename from tools/telemetry/telemetry/inspector_runtime_unittest.py
rename to tools/telemetry/telemetry/core/chrome/inspector_runtime_unittest.py
index ddffe84b9b1e64cdc18b9c4cf60e025d9c67dd9d..352a3137e6d255617059c9148b5e646c86343c30 100644
--- a/tools/telemetry/telemetry/inspector_runtime_unittest.py
+++ b/tools/telemetry/telemetry/core/chrome/inspector_runtime_unittest.py
@@ -1,8 +1,8 @@
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-from telemetry import inspector_runtime
-from telemetry import tab_test_case
+from telemetry.core import exceptions
+from telemetry.test import tab_test_case
class InspectorRuntimeTest(tab_test_case.TabTestCase):
def testRuntimeEvaluateSimple(self):
@@ -10,7 +10,7 @@ class InspectorRuntimeTest(tab_test_case.TabTestCase):
assert res == 2
def testRuntimeEvaluateThatFails(self):
- self.assertRaises(inspector_runtime.EvaluateException,
+ self.assertRaises(exceptions.EvaluateException,
lambda: self._tab.EvaluateJavaScript('fsdfsdfsf'))
def testRuntimeEvaluateOfSomethingThatCantJSONize(self):
@@ -25,7 +25,7 @@ class InspectorRuntimeTest(tab_test_case.TabTestCase):
cur = next;
}
root;""")
- self.assertRaises(inspector_runtime.EvaluateException, test)
+ self.assertRaises(exceptions.EvaluateException, test)
def testRuntimeExecuteOfSomethingThatCantJSONize(self):
self._tab.ExecuteJavaScript('window')

Powered by Google App Engine
This is Rietveld 408576698