| Index: tools/telemetry/telemetry/page/page_set_unittest.py
|
| diff --git a/tools/telemetry/telemetry/page/page_set_unittest.py b/tools/telemetry/telemetry/page/page_set_unittest.py
|
| index 0b5b4ea83e50ee775a75fb144c18aebee9aded37..8074e07539a85c2cf696e47f7627c5619886e855 100644
|
| --- a/tools/telemetry/telemetry/page/page_set_unittest.py
|
| +++ b/tools/telemetry/telemetry/page/page_set_unittest.py
|
| @@ -9,6 +9,8 @@ import unittest
|
| from telemetry.core import util
|
| from telemetry.page import page_set
|
|
|
| +from unittest_data import test_page_set
|
| +
|
|
|
| class TestPageSet(unittest.TestCase):
|
|
|
| @@ -42,34 +44,20 @@ class TestPageSet(unittest.TestCase):
|
| os.rmdir(directory_path)
|
|
|
| def testSuccesfulPythonPageSetLoading(self):
|
| - test_pps_dir = os.path.join(util.GetUnittestDataDir(), 'test_page_set.py')
|
| - pps = page_set.PageSet.FromFile(test_pps_dir)
|
| - self.assertEqual('TestPageSet', pps.__class__.__name__)
|
| + pps = test_page_set.TestPageSet()
|
| self.assertEqual('A pageset for testing purpose', pps.description)
|
| self.assertEqual('data/test.json', pps.archive_data_file)
|
| self.assertEqual('data/credential', pps.credentials_path)
|
| self.assertEqual('desktop', pps.user_agent_type)
|
| - self.assertEqual(test_pps_dir, pps.file_path)
|
| + self.assertEqual(test_page_set.__file__, pps.file_path)
|
| self.assertEqual(3, len(pps.pages))
|
| google_page = pps.pages[0]
|
| self.assertEqual('https://www.google.com', google_page.url)
|
| self.assertIs(pps, google_page.page_set)
|
| self.assertTrue(5, google_page.RunGetActionRunner(action_runner=5))
|
|
|
| - def testMultiplePythonPageSetsLoading(self):
|
| - test_pps_1_dir = os.path.join(util.GetUnittestDataDir(),
|
| - 'test_simple_one_page_set.py')
|
| - test_pps_2_dir = os.path.join(util.GetUnittestDataDir(),
|
| - 'test_simple_two_page_set.py')
|
| - pps1 = page_set.PageSet.FromFile(test_pps_1_dir)
|
| - pps2 = page_set.PageSet.FromFile(test_pps_2_dir)
|
| -
|
| - self.assertEqual('TestSimpleOnePageSet', pps1.__class__.__name__)
|
| - self.assertEqual('TestSimpleTwoPageSet', pps2.__class__.__name__)
|
| -
|
| def testPageFilePath(self):
|
| - test_pps_dir = os.path.join(util.GetUnittestDataDir(), 'test_page_set.py')
|
| - pps = page_set.PageSet.FromFile(test_pps_dir)
|
| + pps = test_page_set.TestPageSet()
|
| internal_page = pps.pages[1]
|
| external_page = pps.pages[2]
|
| self.assertEqual(
|
|
|