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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: tools/telemetry/telemetry/unittest_util/system_stub_unittest.py

Issue 1005903004: Revert of Refactor serving_dirs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « tools/telemetry/telemetry/unittest_util/system_stub.py ('k') | tools/telemetry/telemetry/user_story/__init__.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/unittest_util/system_stub_unittest.py
diff --git a/tools/telemetry/telemetry/unittest_util/system_stub_unittest.py b/tools/telemetry/telemetry/unittest_util/system_stub_unittest.py
index de549d58ed0d41d7d499291e7908066251d36dd8..99ef5d40ea2b3e589705b9421287300c11ce159d 100644
--- a/tools/telemetry/telemetry/unittest_util/system_stub_unittest.py
+++ b/tools/telemetry/telemetry/unittest_util/system_stub_unittest.py
@@ -32,38 +32,28 @@
{'preset_internal_file.wpr':CloudStorageTest.INTERNAL_FILE_HASH}}
# Local data files and hashes.
- self.data_files = [
- os.path.join(os.path.sep, 'path', 'to', 'success.wpr'),
- os.path.join(os.path.sep, 'path', 'to', 'wrong_hash.wpr'),
- os.path.join(os.path.sep, 'path', 'to', 'preset_public_file.wpr'),
- os.path.join(os.path.sep, 'path', 'to', 'preset_partner_file.wpr'),
- os.path.join(os.path.sep, 'path', 'to', 'preset_internal_file.wpr')]
+ self.data_files = ['/path/to/success.wpr',
+ '/path/to/wrong_hash.wpr',
+ '/path/to/preset_public_file.wpr',
+ '/path/to/preset_partner_file.wpr',
+ '/path/to/preset_internal_file.wpr']
self.local_file_hashes = {
- os.path.join(os.path.sep, 'path', 'to', 'success.wpr'):
- CloudStorageTest.SUCCESS_FILE_HASH,
- os.path.join(os.path.sep, 'path', 'to', 'wrong_hash.wpr'):
- CloudStorageTest.SUCCESS_FILE_HASH,
- os.path.join(os.path.sep, 'path', 'to', 'preset_public_file.wpr'):
- CloudStorageTest.PUBLIC_FILE_HASH,
- os.path.join(os.path.sep, 'path', 'to', 'preset_partner_file.wpr'):
- CloudStorageTest.PARTNER_FILE_HASH,
- os.path.join(os.path.sep, 'path', 'to', 'preset_internal_file.wpr'):
- CloudStorageTest.INTERNAL_FILE_HASH,
+ '/path/to/success.wpr': CloudStorageTest.SUCCESS_FILE_HASH,
+ '/path/to/wrong_hash.wpr': CloudStorageTest.SUCCESS_FILE_HASH,
+ '/path/to/preset_public_file.wpr':CloudStorageTest.PUBLIC_FILE_HASH,
+ '/path/to/preset_partner_file.wpr':CloudStorageTest.PARTNER_FILE_HASH,
+ '/path/to/preset_internal_file.wpr':CloudStorageTest.INTERNAL_FILE_HASH,
}
self.cloud_storage.SetCalculatedHashesForTesting(self.local_file_hashes)
# Local hash files and their contents.
local_hash_files = {
- os.path.join(os.path.sep, 'path', 'to', 'success.wpr.sha1'):
- CloudStorageTest.SUCCESS_FILE_HASH,
- os.path.join(os.path.sep, 'path', 'to', 'wrong_hash.wpr.sha1'):
- 'wronghash'.zfill(40),
- os.path.join(os.path.sep, 'path', 'to', 'preset_public_file.wpr.sha1'):
- CloudStorageTest.PUBLIC_FILE_HASH,
- os.path.join(os.path.sep, 'path', 'to', 'preset_partner_file.wpr.sha1'):
- CloudStorageTest.PARTNER_FILE_HASH,
- os.path.join(os.path.sep, 'path', 'to',
- 'preset_internal_file.wpr.sha1'):
- CloudStorageTest.INTERNAL_FILE_HASH,
+ '/path/to/success.wpr.sha1': CloudStorageTest.SUCCESS_FILE_HASH,
+ '/path/to/wrong_hash.wpr.sha1': 'wronghash'.zfill(40),
+ '/path/to/preset_public_file.wpr.sha1': CloudStorageTest.PUBLIC_FILE_HASH,
+ '/path/to/preset_partner_file.wpr.sha1':
+ CloudStorageTest.PARTNER_FILE_HASH,
+ '/path/to/preset_internal_file.wpr.sha1':
+ CloudStorageTest.INTERNAL_FILE_HASH,
}
self.cloud_storage.SetHashFileContentsForTesting(local_hash_files)
@@ -83,25 +73,25 @@
self.assertFalse(self.cloud_storage.Exists(self.cloud_storage.PUBLIC_BUCKET,
'preset_public_file.wpr'))
self.assertFalse(self.cloud_storage.Exists(
- self.cloud_storage.PARTNER_BUCKET, 'preset_partner_file.wpr'))
- self.assertFalse(self.cloud_storage.Exists(
- self.cloud_storage.INTERNAL_BUCKET, 'preset_internal_file.wpr'))
+ self.cloud_storage.PARTNER_BUCKET, 'preset_partner_file.wpr'))
+ self.assertFalse(self.cloud_storage.Exists(
+ self.cloud_storage.INTERNAL_BUCKET, 'preset_internal_file.wpr'))
def testExistsNonEmptyCloudStorage(self):
# Test non-empty remote files dictionary.
self.cloud_storage.SetRemotePathsForTesting(self.remote_paths)
+ self.assertTrue(self.cloud_storage.Exists(self.cloud_storage.PUBLIC_BUCKET,
+ 'preset_public_file.wpr'))
+ self.assertTrue(self.cloud_storage.Exists(self.cloud_storage.PARTNER_BUCKET,
+ 'preset_partner_file.wpr'))
self.assertTrue(self.cloud_storage.Exists(
- self.cloud_storage.PUBLIC_BUCKET, 'preset_public_file.wpr'))
- self.assertTrue(self.cloud_storage.Exists(
- self.cloud_storage.PARTNER_BUCKET, 'preset_partner_file.wpr'))
- self.assertTrue(self.cloud_storage.Exists(
- self.cloud_storage.INTERNAL_BUCKET, 'preset_internal_file.wpr'))
- self.assertFalse(self.cloud_storage.Exists(
- self.cloud_storage.PUBLIC_BUCKET, 'fake_file'))
- self.assertFalse(self.cloud_storage.Exists(
- self.cloud_storage.PARTNER_BUCKET, 'fake_file'))
- self.assertFalse(self.cloud_storage.Exists(
- self.cloud_storage.INTERNAL_BUCKET, 'fake_file'))
+ self.cloud_storage.INTERNAL_BUCKET, 'preset_internal_file.wpr'))
+ self.assertFalse(self.cloud_storage.Exists(self.cloud_storage.PUBLIC_BUCKET,
+ 'fake_file'))
+ self.assertFalse(self.cloud_storage.Exists(
+ self.cloud_storage.PARTNER_BUCKET, 'fake_file'))
+ self.assertFalse(self.cloud_storage.Exists(
+ self.cloud_storage.INTERNAL_BUCKET, 'fake_file'))
# Reset state.
self.cloud_storage.SetRemotePathsForTesting()
@@ -110,72 +100,64 @@
self.cloud_storage.SetRemotePathsForTesting(self.remote_paths)
self.assertFalse(self.cloud_storage.Exists(self.cloud_storage.PUBLIC_BUCKET,
'success.wpr'))
- self.cloud_storage.Insert(
- self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
- os.path.join(os.path.sep, 'path', 'to', 'success.wpr'))
- self.assertTrue(self.cloud_storage.Exists(
- self.cloud_storage.PUBLIC_BUCKET, 'success.wpr'))
+ self.cloud_storage.Insert(self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
+ '/path/to/success.wpr')
+ self.assertTrue(self.cloud_storage.Exists(self.cloud_storage.PUBLIC_BUCKET,
+ 'success.wpr'))
# Reset state.
self.cloud_storage.SetRemotePathsForTesting()
def testEmptyInsertAndExistsPublic(self):
# Test empty remote files dictionary.
- self.assertFalse(self.cloud_storage.Exists(
- self.cloud_storage.PUBLIC_BUCKET, 'success.wpr'))
- self.cloud_storage.Insert(
- self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
- os.path.join(os.path.sep, 'path', 'to', 'success.wpr'))
- self.assertTrue(self.cloud_storage.Exists(
- self.cloud_storage.PUBLIC_BUCKET, 'success.wpr'))
+ self.assertFalse(self.cloud_storage.Exists(self.cloud_storage.PUBLIC_BUCKET,
+ 'success.wpr'))
+ self.cloud_storage.Insert(self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
+ '/path/to/success.wpr')
+ self.assertTrue(self.cloud_storage.Exists(self.cloud_storage.PUBLIC_BUCKET,
+ 'success.wpr'))
def testEmptyInsertAndGet(self):
self.assertRaises(self.cloud_storage.NotFoundError, self.cloud_storage.Get,
self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
- os.path.join(os.path.sep, 'path', 'to', 'success.wpr'))
- self.cloud_storage.Insert(self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
- os.path.join(os.path.sep, 'path', 'to',
- 'success.wpr'))
- self.assertTrue(self.cloud_storage.Exists(
- self.cloud_storage.PUBLIC_BUCKET, 'success.wpr'))
- self.assertEqual(CloudStorageTest.SUCCESS_FILE_HASH, self.cloud_storage.Get(
- self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
- os.path.join(os.path.sep, 'path', 'to', 'success.wpr')))
+ '/path/to/success.wpr')
+ self.cloud_storage.Insert(self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
+ '/path/to/success.wpr')
+ self.assertTrue(self.cloud_storage.Exists(self.cloud_storage.PUBLIC_BUCKET,
+ 'success.wpr'))
+ self.assertEqual(CloudStorageTest.SUCCESS_FILE_HASH,
+ self.cloud_storage.Get(self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
+ '/path/to/success.wpr'))
def testNonEmptyInsertAndGet(self):
self.cloud_storage.SetRemotePathsForTesting(self.remote_paths)
self.assertRaises(self.cloud_storage.NotFoundError, self.cloud_storage.Get,
self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
- os.path.join(os.path.sep, 'path', 'to', 'success.wpr'))
- self.cloud_storage.Insert(self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
- os.path.join(os.path.sep, 'path', 'to',
- 'success.wpr'))
- self.assertTrue(self.cloud_storage.Exists(self.cloud_storage.PUBLIC_BUCKET,
- 'success.wpr'))
- self.assertEqual(
- CloudStorageTest.SUCCESS_FILE_HASH, self.cloud_storage.Get(
- self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
- os.path.join(os.path.sep, 'path', 'to', 'success.wpr')))
+ '/path/to/success.wpr')
+ self.cloud_storage.Insert(self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
+ '/path/to/success.wpr')
+ self.assertTrue(self.cloud_storage.Exists(self.cloud_storage.PUBLIC_BUCKET,
+ 'success.wpr'))
+ self.assertEqual(CloudStorageTest.SUCCESS_FILE_HASH,
+ self.cloud_storage.Get(self.cloud_storage.PUBLIC_BUCKET,
+ 'success.wpr',
+ '/path/to/success.wpr'))
# Reset state.
self.cloud_storage.SetRemotePathsForTesting()
def testGetIfChanged(self):
self.cloud_storage.SetRemotePathsForTesting(self.remote_paths)
- self.assertRaises(
- self.cloud_storage.NotFoundError, self.cloud_storage.Get,
- self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
- os.path.join(os.path.sep, 'path', 'to', 'success.wpr'))
+ self.assertRaises(self.cloud_storage.NotFoundError, self.cloud_storage.Get,
+ self.cloud_storage.PUBLIC_BUCKET, 'success.wpr',
+ '/path/to/success.wpr')
self.assertFalse(self.cloud_storage.GetIfChanged(
- os.path.join(os.path.sep, 'path', 'to', 'preset_public_file.wpr'),
- self.cloud_storage.PUBLIC_BUCKET))
+ '/path/to/preset_public_file.wpr', self.cloud_storage.PUBLIC_BUCKET))
self.cloud_storage.ChangeRemoteHashForTesting(
- self.cloud_storage.PUBLIC_BUCKET, 'preset_public_file.wpr',
- CloudStorageTest.UPDATED_HASH)
+ self.cloud_storage.PUBLIC_BUCKET, 'preset_public_file.wpr',
+ CloudStorageTest.UPDATED_HASH)
self.assertTrue(self.cloud_storage.GetIfChanged(
- os.path.join(os.path.sep, 'path', 'to', 'preset_public_file.wpr'),
- self.cloud_storage.PUBLIC_BUCKET))
+ '/path/to/preset_public_file.wpr', self.cloud_storage.PUBLIC_BUCKET))
self.assertFalse(self.cloud_storage.GetIfChanged(
- os.path.join(os.path.sep, 'path', 'to', 'preset_public_file.wpr'),
- self.cloud_storage.PUBLIC_BUCKET))
+ '/path/to/preset_public_file.wpr', self.cloud_storage.PUBLIC_BUCKET))
# Reset state.
self.cloud_storage.SetRemotePathsForTesting()
@@ -191,50 +173,47 @@
def testPermissionError(self):
self.cloud_storage.SetRemotePathsForTesting(self.remote_paths)
self.cloud_storage.SetPermissionLevelForTesting(
- self.cloud_storage.PUBLIC_PERMISSION)
- self.assertRaises(
- self.cloud_storage.PermissionError, self.cloud_storage.Get,
- self.cloud_storage.INTERNAL_BUCKET, 'preset_internal_file.wpr',
- os.path.join(os.path.sep, 'path', 'to', 'preset_internal_file.wpr'))
- self.assertRaises(
- self.cloud_storage.PermissionError, self.cloud_storage.GetIfChanged,
- os.path.join(os.path.sep, 'path', 'to', 'preset_internal_file.wpr'),
- self.cloud_storage.INTERNAL_BUCKET)
- self.assertRaises(
- self.cloud_storage.PermissionError, self.cloud_storage.List,
- self.cloud_storage.INTERNAL_BUCKET)
- self.assertRaises(
- self.cloud_storage.PermissionError, self.cloud_storage.Exists,
- self.cloud_storage.INTERNAL_BUCKET, 'preset_internal_file.wpr')
- self.assertRaises(
- self.cloud_storage.PermissionError, self.cloud_storage.Insert,
- self.cloud_storage.INTERNAL_BUCKET, 'success.wpr',
- os.path.join(os.path.sep, 'path', 'to', 'success.wpr'))
+ self.cloud_storage.PUBLIC_PERMISSION)
+ self.assertRaises(
+ self.cloud_storage.PermissionError, self.cloud_storage.Get,
+ self.cloud_storage.INTERNAL_BUCKET, 'preset_internal_file.wpr',
+ '/path/to/preset_internal_file.wpr')
+ self.assertRaises(
+ self.cloud_storage.PermissionError, self.cloud_storage.GetIfChanged,
+ '/path/to/preset_internal_file.wpr', self.cloud_storage.INTERNAL_BUCKET)
+ self.assertRaises(
+ self.cloud_storage.PermissionError, self.cloud_storage.List,
+ self.cloud_storage.INTERNAL_BUCKET)
+ self.assertRaises(
+ self.cloud_storage.PermissionError, self.cloud_storage.Exists,
+ self.cloud_storage.INTERNAL_BUCKET, 'preset_internal_file.wpr')
+ self.assertRaises(
+ self.cloud_storage.PermissionError, self.cloud_storage.Insert,
+ self.cloud_storage.INTERNAL_BUCKET, 'success.wpr', '/path/to/success.wpr')
# Reset state.
self.cloud_storage.SetRemotePathsForTesting()
def testCredentialsError(self):
self.cloud_storage.SetRemotePathsForTesting(self.remote_paths)
self.cloud_storage.SetPermissionLevelForTesting(
- self.cloud_storage.CREDENTIALS_ERROR_PERMISSION)
- self.assertRaises(
- self.cloud_storage.CredentialsError, self.cloud_storage.Get,
- self.cloud_storage.INTERNAL_BUCKET, 'preset_internal_file.wpr',
- os.path.join(os.path.sep, 'path', 'to', 'preset_internal_file.wpr'))
- self.assertRaises(
- self.cloud_storage.CredentialsError, self.cloud_storage.GetIfChanged,
- self.cloud_storage.INTERNAL_BUCKET,
- os.path.join(os.path.sep, 'path', 'to', 'preset_internal_file.wpr'))
- self.assertRaises(
- self.cloud_storage.CredentialsError, self.cloud_storage.List,
- self.cloud_storage.INTERNAL_BUCKET)
- self.assertRaises(
- self.cloud_storage.CredentialsError, self.cloud_storage.Exists,
- self.cloud_storage.INTERNAL_BUCKET, 'preset_internal_file.wpr')
- self.assertRaises(
- self.cloud_storage.CredentialsError, self.cloud_storage.Insert,
- self.cloud_storage.INTERNAL_BUCKET, 'success.wpr',
- os.path.join(os.path.sep, 'path', 'to', 'success.wpr'))
+ self.cloud_storage.CREDENTIALS_ERROR_PERMISSION)
+ self.assertRaises(
+ self.cloud_storage.CredentialsError, self.cloud_storage.Get,
+ self.cloud_storage.INTERNAL_BUCKET, 'preset_internal_file.wpr',
+ '/path/to/preset_internal_file.wpr')
+ self.assertRaises(
+ self.cloud_storage.CredentialsError, self.cloud_storage.GetIfChanged,
+ self.cloud_storage.INTERNAL_BUCKET, '/path/to/preset_internal_file.wpr')
+ self.assertRaises(
+ self.cloud_storage.CredentialsError, self.cloud_storage.List,
+ self.cloud_storage.INTERNAL_BUCKET)
+ self.assertRaises(
+ self.cloud_storage.CredentialsError, self.cloud_storage.Exists,
+ self.cloud_storage.INTERNAL_BUCKET, 'preset_internal_file.wpr')
+ self.assertRaises(
+ self.cloud_storage.CredentialsError, self.cloud_storage.Insert,
+ self.cloud_storage.INTERNAL_BUCKET, 'success.wpr',
+ '/path/to/success.wpr')
# Reset state.
self.cloud_storage.SetRemotePathsForTesting()
« no previous file with comments | « tools/telemetry/telemetry/unittest_util/system_stub.py ('k') | tools/telemetry/telemetry/user_story/__init__.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698