Index: tools/telemetry/telemetry/core/tab_unittest.py |
diff --git a/tools/telemetry/telemetry/tab_unittest.py b/tools/telemetry/telemetry/core/tab_unittest.py |
similarity index 88% |
rename from tools/telemetry/telemetry/tab_unittest.py |
rename to tools/telemetry/telemetry/core/tab_unittest.py |
index 003e9bac64c28431b2e782c97a50c4e3195a16b2..34945f055b4b50533e611e30cb114c3524b99577 100644 |
--- a/tools/telemetry/telemetry/tab_unittest.py |
+++ b/tools/telemetry/telemetry/core/tab_unittest.py |
@@ -3,9 +3,9 @@ |
# found in the LICENSE file. |
import os |
-from telemetry import tab_test_case |
-from telemetry import tab_crash_exception |
-from telemetry import util |
+from telemetry.core import util |
+from telemetry.core import exceptions |
+from telemetry.test import tab_test_case |
def _IsDocumentVisible(tab): |
@@ -28,9 +28,9 @@ class TabTest(tab_test_case.TabTestCase): |
self.assertEquals(self._tab.browser, self._browser) |
def testRendererCrash(self): |
- self.assertRaises(tab_crash_exception.TabCrashException, |
+ self.assertRaises(exceptions.TabCrashException, |
lambda: self._tab.Navigate('chrome://crash', |
- timeout=5)) |
+ timeout=5)) |
def testActivateTab(self): |
if not self._browser.supports_tab_control: |
@@ -51,7 +51,7 @@ class GpuTabTest(tab_test_case.TabTestCase): |
def testScreenshot(self): |
unittest_data_dir = os.path.join(os.path.dirname(__file__), |
- '..', 'unittest_data') |
+ '..', '..', 'unittest_data') |
self._browser.SetHTTPServerDirectory(unittest_data_dir) |
self._tab.Navigate( |
self._browser.http_server.UrlOf('green_rect.html')) |