Redirecting old ui to new ui

appengine/swarming/handlers_test.py

Index: appengine/swarming/handlers_test.py
diff --git a/appengine/swarming/handlers_test.py b/appengine/swarming/handlers_test.py
index 2b38f2918d50551d8e7a9a1bc07a309945c6455b..fa8438b35980447e58206a85bcd9a6dd3b8dcb06 100755
--- a/appengine/swarming/handlers_test.py
+++ b/appengine/swarming/handlers_test.py
@@ -48,49 +48,6 @@ class AppTestBase(test_env_handlers.AppTestBase):
 
 
 class FrontendTest(AppTestBase):
-  def test_bots(self):
-    self.set_as_admin()
-
-    # Add bots to display.
-    state = {
-      'dict': {'random': 'values'},
-      'float': 0.,
-      'list': ['of', 'things'],
-      'str': u'uni',
-    }
-    bot_management.bot_event(
-        event_type='bot_connected', bot_id='id1',
-        external_ip='8.8.4.4', authenticated_as='bot:whitelisted-ip',
-        dimensions={'id': ['id1']}, state=state, version='123456789',
-        quarantined=False, task_id=None, task_name=None)
-    bot_management.bot_event(
-        event_type='bot_connected', bot_id='id2',
-        external_ip='8.8.8.8', authenticated_as='bot:whitelisted-ip',
-        dimensions={'id': ['id2']}, state={'ram': 65}, version='123456789',
-        quarantined=False, task_id=None, task_name=None)
-
-    response = self.app.get('/restricted/bots', status=200)
-    self.assertGreater(len(response.body), 1000)
-
-  def test_delete_bot(self):
-    self.set_as_admin()
-
-    bot_management.bot_event(
-        event_type='bot_connected', bot_id='id1',
-        external_ip='8.8.4.4', authenticated_as='bot:whitelisted-ip',
-        dimensions={'id': ['id1']}, state={'foo': 'bar'}, version='123456789',
-        quarantined=False, task_id=None, task_name=None)
-    response = self.app.get('/restricted/bots', status=200)
-    self.assertTrue('id1' in response.body)
-
-    response = self.app.post(
-        '/restricted/bot/id1/delete',
-        params={},
-        headers={'X-XSRF-Token': self.get_xsrf_token()})
-    self.assertFalse('id1' in response.body)
-
-    response = self.app.get('/restricted/bots', status=200)
-    self.assertFalse('id1' in response.body)
 
   def test_root(self):
     response = self.app.get('/', status=200)
@@ -122,6 +79,8 @@ class FrontendTest(AppTestBase):
       '/swarming/api/v1/stats/summary/<resolution:[a-z]+>',
       '/swarming/api/v1/stats/dimensions/<dimensions:.+>/<resolution:[a-z]+>',
       '/swarming/api/v1/stats/user/<user:.+>/<resolution:[a-z]+>',
+      '/user/tasks',
+      '/restricted/bots',
     ])
 
     # Grab the set of all routes.
@@ -190,190 +149,15 @@ class FrontendTest(AppTestBase):
     for url in urls:
       self.app.get(url, status=200)
 
-  def test_task_list_empty(self):
-    # Just assert it doesn't throw.
-    self.set_as_privileged_user()
-    self.app.get('/user/tasks', status=200)
-    self.app.get('/user/task/12345', status=404)
-
-  def test_add_task_and_list_user(self):
-    # Add a task via the API as a user, then assert it can be viewed.
-    self.set_as_user()
-    _, task_id = self.client_create_task_raw()
-
-    self.set_as_privileged_user()
-    self.app.get('/user/tasks', status=200)
-    self.app.get('/user/task/%s' % task_id, status=200)
-
-    self.set_as_bot()
-    self.do_handshake()
-    reaped = self.bot_poll()
-    self.bot_complete_task(task_id=reaped['manifest']['task_id'])
-    # Add unicode chars.
-
-    # This can only work once a bot reaped the task.
-    self.set_as_privileged_user()
-    self.app.get('/user/task/%s' % reaped['manifest']['task_id'], status=200)
-
-  def test_task_deduped(self):
-    self.set_as_user()
-    _, task_id_1 = self.client_create_task_raw(properties=dict(idempotent=True))
-
-    self.set_as_bot()
-    task_id_bot = self.bot_run_task()
-    self.assertEqual(task_id_1, task_id_bot[:-1] + '0')
-    self.assertEqual('1', task_id_bot[-1:])
-
-    # Create a second task. Results will be returned immediately without the bot
-    # running anything.
-    self.set_as_user()
-    _, task_id_2 = self.client_create_task_raw(
-        name='ho', properties=dict(idempotent=True))
-
-    self.set_as_bot()
-    resp = self.bot_poll()
-    self.assertEqual('sleep', resp['cmd'])
-
-    self.set_as_privileged_user()
-    # Look at the results. It's the same as the previous run, even if task_id_2
-    # was never executed.
-    response = self.app.get('/user/task/%s' % task_id_2, status=200)
-    self.assertTrue(
-        u'rÉsult string'.encode('utf-8') in response.body, response.body)
-    self.assertTrue('Was deduped from' in response.body, response.body)
-
-  def test_task_denied(self):
-    # Add a task via the API as a user, then assert it can't be viewed by
-    # anonymous user.
-    self.set_as_user()
-    _, task_id = self.client_create_task_raw()
-
-    # Redirect to login page.
+  def test_task_redirect(self):
     self.set_as_anonymous()
     self.app.get('/user/tasks', status=302)
-    self.app.get('/user/task/%s' % task_id, status=302)
+    self.app.get('/user/task/123', status=302)
 
-  @staticmethod
-  def _sort_state_product():
-    sort_choices = [i[0] for i in handlers_frontend.TasksHandler.SORT_CHOICES]
-    state_choices = sum(
-        ([i[0] for i in j]
-          for j in handlers_frontend.TasksHandler.STATE_CHOICES),
-        [])
-    return itertools.product(sort_choices, state_choices)
-
-  def test_task_list_query(self):
-    # Try all the combinations of task queries to ensure the index exist.
-    self.set_as_privileged_user()
-    self.client_create_task_raw()
-    for sort, state in self._sort_state_product():
-      url = '/user/tasks?sort=%s&state=%s' % (sort, state)
-      # See require_index in ../components/support/test_case.py in case of
-      # NeedIndexError. Do not use status=200 so the output is printed in case
-      # of failure.
-      resp = self.app.get(url, expect_errors=True)
-      self.assertEqual(200, resp.status_code, (resp.body, sort, state))
-
-    self.app.get('/user/tasks?sort=foo', status=400)
-    self.app.get('/user/tasks?state=foo', status=400)
-
-  def test_task_search_task_tag(self):
-    # Try all the combinations of task queries to ensure the index exist.
-    self.set_as_privileged_user()
-    self.client_create_task_raw()
-    self.set_as_bot()
-    reaped = self.bot_poll()
-    self.bot_complete_task(task_id=reaped['manifest']['task_id'])
-    self.set_as_privileged_user()
-    self.app.get('/user/tasks?task_tag=yo:dawg', status=200)
-    for sort, state in self._sort_state_product():
-      url = '/user/tasks?sort=%s&state=%s' % (sort, state)
-      self.app.get(url + '&task_tag=yo:dawg', status=200)
-
-  def test_task_cancel(self):
-    self.set_as_privileged_user()
-    _, task_id = self.client_create_task_raw()
-
-    self.set_as_admin()
-    # Just ensure it doesn't crash when it shows the 'Cancel' button.
-    self.app.get('/user/tasks')
-
-    xsrf_token = self.get_xsrf_token()
-    self.app.post(
-        '/user/task/%s/cancel' % task_id, {'xsrf_token': xsrf_token})
-
-    # Ensure there's no task available anymore by polling.
-    self.set_as_bot()
-    reaped = self.bot_poll('bot1')
-    self.assertEqual('sleep', reaped['cmd'])
-
-  def test_task_retry(self):
-    self.set_as_privileged_user()
-    _, task_id = self.client_create_task_raw()
-    xsrf_token = self.get_xsrf_token()
-    resp = self.app.post(
-        '/user/task/%s/retry' % task_id, {'xsrf_token': xsrf_token})
-    self.assertEqual(302, resp.status_code)
-    prefix = 'http://localhost/user/task/'
-    self.assertTrue(resp.location.startswith(prefix))
-    new_task_id = resp.location[len(prefix):]
-    self.assertNotEqual(new_task_id, task_id)
-
-    # Both tasks are scheduled.
-    self.set_as_bot()
-    reaped = self.bot_poll('bot1')
-    self.assertEqual('run', reaped['cmd'])
-    self.assertEqual(task_id[:-1] + '1', reaped['manifest']['task_id'])
-    reaped = self.bot_poll('bot2')
-    self.assertEqual('run', reaped['cmd'])
-    self.assertEqual(new_task_id[:-1] + '1', reaped['manifest']['task_id'])
-
-  def test_bot_list_empty(self):
-    # Just assert it doesn't throw.
-    self.set_as_admin()
-    self.app.get('/restricted/bots', status=200)
-    self.app.get('/restricted/bot/unknown_bot', status=200)
-
-  def test_bot_listing(self):
-    # Create a task, create 2 bots, one with a task assigned, the other without.
-    self.set_as_admin()
-    self.client_create_task_raw()
-
-    self.set_as_bot()
-    self.bot_poll('bot1')
-    self.bot_poll('bot2')
-    params = self.do_handshake('bot2')
-    params['event'] = 'bot_log'
-    params['message'] = 'for the best'
-    self.assertEqual({}, self.post_json('/swarming/api/v1/bot/event', params))
-
-    self.set_as_admin()
-    response = self.app.get('/restricted/bots', status=200)
-    next_page_re = re.compile(r'<a\s+href="(.+?)">Next page</a>')
-    self.assertFalse(next_page_re.search(response.body))
-    self.app.get('/restricted/bot/bot1', status=200)
-    response = self.app.get('/restricted/bot/bot2', status=200)
-    self.assertIn('for the best', response.body)
-
-    response = self.app.get('/restricted/bots?limit=1', status=200)
-    url = next_page_re.search(response.body).group(1)
-    self.assertTrue(
-        url.startswith('/restricted/bots?limit=1&sort_by=__key__&cursor='), url)
-    response = self.app.get(url, status=200)
-    self.assertFalse(next_page_re.search(response.body))
-
-    # Test more complex indexes.
-    for sort_by in handlers_frontend.BotsListHandler.ACCEPTABLE_BOTS_SORTS:
-      response = self.app.get(
-          '/restricted/bots?limit=1&sort_by=%s' % sort_by, status=200)
-      self.assertTrue(next_page_re.search(response.body), sort_by)
-      response = self.app.get(
-          '/restricted/bots?limit=1&sort_by=%s&dimensions=os:Amiga%%0Aid:bot1' %
-          sort_by,
-          status=200)
-      # The bot1 should be in the response.
-      self.assertTrue('pool' in response.body, sort_by)
-      self.assertTrue('default' in response.body, sort_by)
+  def test_bot_redirect(self):
+    self.set_as_anonymous()
+    self.app.get('/restricted/bots', status=302)
+    self.app.get('/restricted/bot/bot321', status=302)
 
 
 class FrontendAdminTest(AppTestBase):