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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: dashboard/dashboard/pinpoint/handlers/new_test.py

Issue 2996473002: [pinpoint] Add QuestGenerator object. (Closed)
Patch Set: QuestGenerator Created 3 years, 4 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
« dashboard/dashboard/pinpoint/handlers/jobs_test.py ('K') | « dashboard/dashboard/pinpoint/handlers/new.py ('k') | dashboard/dashboard/pinpoint/models/change.py » ('j') | dashboard/dashboard/pinpoint/models/quest_generator.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dashboard/dashboard/pinpoint/handlers/new_test.py
diff --git a/dashboard/dashboard/pinpoint/handlers/new_test.py b/dashboard/dashboard/pinpoint/handlers/new_test.py
index f8984079fcc7942dbae3e73a252b27facd9544d7..b4a23a37838219849cb00c570a067fd0eebfe437 100644
--- a/dashboard/dashboard/pinpoint/handlers/new_test.py
+++ b/dashboard/dashboard/pinpoint/handlers/new_test.py
@@ -18,9 +18,23 @@ from dashboard.services import gitiles_service
from dashboard.pinpoint.handlers import new
from dashboard.pinpoint.models import job as job_module
-AUTHORIZED_USER = users.User(email='authorized_person@chromium.org',
- _auth_domain='google.com')
-UNAUTHORIZED_USER = users.User(email='foo@bar.com', _auth_domain='bar.com')
+
+_AUTHORIZED_USER = users.User(email='authorized_person@chromium.org',
+ _auth_domain='google.com')
+_UNAUTHORIZED_USER = users.User(email='foo@bar.com', _auth_domain='bar.com')
+
+
+_BASE_REQUEST = {
+ 'target': 'telemetry_perf_tests',
+ 'configuration': 'chromium-rel-mac11-pro',
+ 'benchmark': 'speedometer',
+ 'auto_explore': '1',
+ 'bug_id': '12345',
+ 'start_repository': 'src',
+ 'start_git_hash': '1',
+ 'end_repository': 'src',
+ 'end_git_hash': '3',
+}
class NewTest(testing_common.TestCase):
@@ -41,7 +55,7 @@ class NewTest(testing_common.TestCase):
})
def _SetAuthorizedOAuth(self, mock_oauth):
- mock_oauth.get_current_user.return_value = AUTHORIZED_USER
+ mock_oauth.get_current_user.return_value = _AUTHORIZED_USER
mock_oauth.get_client_id.return_value = (
api_auth.OAUTH_CLIENT_ID_WHITELIST[0])
@@ -49,7 +63,7 @@ class NewTest(testing_common.TestCase):
@mock.patch.object(api_auth, 'oauth')
def testPost_NoAccess_ShowsError(self, mock_oauth):
self.SetCurrentUser('external@chromium.org')
- mock_oauth.get_current_user.return_value = UNAUTHORIZED_USER
+ mock_oauth.get_current_user.return_value = _UNAUTHORIZED_USER
mock_oauth.get_client_id.return_value = (
api_auth.OAUTH_CLIENT_ID_WHITELIST[0])
response = self.testapp.post('/api/new', status=200)
@@ -69,7 +83,7 @@ class NewTest(testing_common.TestCase):
@mock.patch.object(api_auth, 'users')
def testPost_BadOauthClientId(self, mock_users, mock_oauth):
mock_users.get_current_user.return_value = None
- mock_oauth.get_current_user.return_value = AUTHORIZED_USER
+ mock_oauth.get_current_user.return_value = _AUTHORIZED_USER
mock_oauth.get_client_id.return_value = 'invalid'
response = self.testapp.post('/api/new', status=200)
self.assertIn('error', json.loads(response.body))
@@ -86,76 +100,30 @@ class NewTest(testing_common.TestCase):
{'commit': '2'},
{'commit': '3'},
]
- params = {
- 'configuration': 'chromium-rel-mac11-pro',
- 'test_suite': 'speedometer',
- 'test': '',
- 'metric': 'Total',
- 'auto_explore': '1',
- 'bug_id': 12345,
- 'start_repository': 'src',
- 'start_git_hash': '1',
- 'end_repository': 'src',
- 'end_git_hash': '3'
- }
- response = self.testapp.post('/api/new', params, status=200)
+ response = self.testapp.post('/api/new', _BASE_REQUEST, status=200)
result = json.loads(response.body)
self.assertIn('jobId', result)
self.assertEqual(
result['jobUrl'],
'https://testbed.example.com/job/%s' % result['jobId'])
- def testPost_MetricButNoTestSuite(self):
- params = {
- 'configuration': 'chromium-rel-mac11-pro',
- 'test_suite': '',
- 'test': '',
- 'metric': 'Total',
- 'auto_explore': '1',
- 'bug_id': 12345,
- 'start_repository': 'src',
- 'start_git_hash': '1',
- 'end_repository': 'src',
- 'end_git_hash': '3'
- }
- response = self.testapp.post('/api/new', params, status=200)
- self.assertEqual({'error': new._ERROR_METRIC_NO_TEST_SUITE},
- json.loads(response.body))
+ def testPost_InvalidTestConfig(self):
+ request = dict(_BASE_REQUEST)
+ del request['configuration']
+ response = self.testapp.post('/api/new', request, status=200)
+ self.assertIn('error', json.loads(response.body))
perezju 2017/08/16 08:15:25 nit: also add test for missing target
dtu 2017/08/16 17:31:48 Done.
@mock.patch.object(
gitiles_service, 'CommitInfo',
- mock.MagicMock(side_effect=gitiles_service.NotFoundError))
+ mock.MagicMock(side_effect=gitiles_service.NotFoundError('message')))
def testPost_InvalidChange(self):
- params = {
- 'configuration': 'chromium-rel-mac11-pro',
- 'test_suite': 'speedometer',
- 'test': '',
- 'metric': 'Total',
- 'auto_explore': '1',
- 'bug_id': 12345,
- 'start_repository': 'src',
- 'start_git_hash': '1',
- 'end_repository': 'src',
- 'end_git_hash': '3'
- }
- response = self.testapp.post('/api/new', params, status=200)
- self.assertEqual({'error': 'NotFoundError()'},
- json.loads(response.body))
+ response = self.testapp.post('/api/new', _BASE_REQUEST, status=200)
+ self.assertEqual({'error': 'message'}, json.loads(response.body))
def testPost_InvalidBug(self):
- params = {
- 'configuration': 'chromium-rel-mac11-pro',
- 'test_suite': 'speedometer',
- 'test': '',
- 'metric': 'Total',
- 'auto_explore': '1',
- 'bug_id': 'not_an_int',
- 'start_repository': 'src',
- 'start_git_hash': '1',
- 'end_repository': 'src',
- 'end_git_hash': '3'
- }
- response = self.testapp.post('/api/new', params, status=200)
+ request = dict(_BASE_REQUEST)
+ request['bug_id'] = 'not_an_int'
+ response = self.testapp.post('/api/new', request, status=200)
self.assertEqual({'error': new._ERROR_BUG_ID},
json.loads(response.body))
@@ -171,19 +139,9 @@ class NewTest(testing_common.TestCase):
{'commit': '2'},
{'commit': '3'},
]
- params = {
- 'configuration': 'chromium-rel-mac11-pro',
- 'test_suite': 'speedometer',
- 'test': '',
- 'metric': 'Total',
- 'auto_explore': '1',
- 'bug_id': '',
- 'start_repository': 'src',
- 'start_git_hash': '1',
- 'end_repository': 'src',
- 'end_git_hash': '3'
- }
- response = self.testapp.post('/api/new', params, status=200)
+ request = dict(_BASE_REQUEST)
+ request['bug_id'] = ''
+ response = self.testapp.post('/api/new', request, status=200)
result = json.loads(response.body)
self.assertIn('jobId', result)
self.assertEqual(
« dashboard/dashboard/pinpoint/handlers/jobs_test.py ('K') | « dashboard/dashboard/pinpoint/handlers/new.py ('k') | dashboard/dashboard/pinpoint/models/change.py » ('j') | dashboard/dashboard/pinpoint/models/quest_generator.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698