Merge remote-tracking branch 'origin/master' into rockyhorror

Conflicts:
	test/data/test.db

test/test_api_security.py

@@ -15,7 +15,7 @@ from endpoints.api.tag import RepositoryTagImages, RepositoryTag
 from endpoints.api.search import FindRepositories, EntitySearch
 from endpoints.api.image import RepositoryImageChanges, RepositoryImage, RepositoryImageList
 from endpoints.api.build import (FileDropResource, RepositoryBuildStatus, RepositoryBuildLogs,
-                                 RepositoryBuildList)
+                                 RepositoryBuildList, RepositoryBuildResource)
 from endpoints.api.robot import (UserRobotList, OrgRobot, OrgRobotList, UserRobot,
                                  RegenerateOrgRobot, RegenerateUserRobot)
 
@@ -1571,6 +1571,60 @@ class TestRepositoryBuildStatusFg86BuynlargeOrgrepo(ApiTestCase):
     self._run_test('GET', 400, 'devtable', None)
 
 
+class TestRepositoryBuildResourceFg86PublicPublicrepo(ApiTestCase):
+  def setUp(self):
+    ApiTestCase.setUp(self)
+    self._set_url(RepositoryBuildResource, build_uuid="FG86", repository="public/publicrepo")
+
+  def test_delete_anonymous(self):
+    self._run_test('DELETE', 401, None, None)
+
+  def test_delete_freshuser(self):
+    self._run_test('DELETE', 403, 'freshuser', None)
+
+  def test_delete_reader(self):
+    self._run_test('DELETE', 403, 'reader', None)
+
+  def test_delete_devtable(self):
+    self._run_test('DELETE', 403, 'devtable', None)
+
+
+class TestRepositoryBuildResourceFg86DevtableShared(ApiTestCase):
+  def setUp(self):
+    ApiTestCase.setUp(self)
+    self._set_url(RepositoryBuildResource, build_uuid="FG86", repository="devtable/shared")
+
+  def test_delete_anonymous(self):
+    self._run_test('DELETE', 401, None, None)
+
+  def test_delete_freshuser(self):
+    self._run_test('DELETE', 403, 'freshuser', None)
+
+  def test_delete_reader(self):
+    self._run_test('DELETE', 403, 'reader', None)
+
+  def test_delete_devtable(self):
+    self._run_test('DELETE', 404, 'devtable', None)
+
+
+class TestRepositoryBuildResourceFg86BuynlargeOrgrepo(ApiTestCase):
+  def setUp(self):
+    ApiTestCase.setUp(self)
+    self._set_url(RepositoryBuildResource, build_uuid="FG86", repository="buynlarge/orgrepo")
+
+  def test_delete_anonymous(self):
+    self._run_test('DELETE', 401, None, None)
+
+  def test_delete_freshuser(self):
+    self._run_test('DELETE', 403, 'freshuser', None)
+
+  def test_delete_reader(self):
+    self._run_test('DELETE', 403, 'reader', None)
+
+  def test_delete_devtable(self):
+    self._run_test('DELETE', 404, 'devtable', None)
+
+
 class TestRepositoryBuildLogsS5j8PublicPublicrepo(ApiTestCase):
   def setUp(self):
     ApiTestCase.setUp(self)

test/test_api_usage.py

@@ -17,7 +17,8 @@ from endpoints.api.team import TeamMember, TeamMemberList, TeamMemberInvite, Org
 from endpoints.api.tag import RepositoryTagImages, RepositoryTag
 from endpoints.api.search import FindRepositories, EntitySearch
 from endpoints.api.image import RepositoryImage, RepositoryImageList
-from endpoints.api.build import RepositoryBuildStatus, RepositoryBuildLogs, RepositoryBuildList
+from endpoints.api.build import (RepositoryBuildStatus, RepositoryBuildLogs, RepositoryBuildList,
+                                 RepositoryBuildResource)
 from endpoints.api.robot import (UserRobotList, OrgRobot, OrgRobotList, UserRobot,
                                  RegenerateUserRobot, RegenerateOrgRobot)
 from endpoints.api.trigger import (BuildTriggerActivate, BuildTriggerSources, BuildTriggerSubdirs,
@@ -1303,6 +1304,103 @@ class TestGetRepository(ApiTestCase):
     self.assertEquals(True, json['is_organization'])
 
 
+
+class TestRepositoryBuildResource(ApiTestCase):
+  def test_cancel_invalidbuild(self):
+    self.login(ADMIN_ACCESS_USER)
+
+    self.deleteResponse(RepositoryBuildResource,
+                        params=dict(repository=ADMIN_ACCESS_USER + '/simple', build_uuid='invalid'),
+                        expected_code=404)
+
+  def test_cancel_waitingbuild(self):
+    self.login(ADMIN_ACCESS_USER)
+
+    # Request a (fake) build.
+    json = self.postJsonResponse(RepositoryBuildList,
+                                 params=dict(repository=ADMIN_ACCESS_USER + '/simple'),
+                                 data=dict(file_id='foobarbaz'),
+                                 expected_code=201)
+
+    uuid = json['id']
+
+    # Check for the build.
+    json = self.getJsonResponse(RepositoryBuildList,
+                                params=dict(repository=ADMIN_ACCESS_USER + '/simple'))
+
+    self.assertEquals(1, len(json['builds']))
+    self.assertEquals(uuid, json['builds'][0]['id'])
+
+    # Cancel the build.
+    self.deleteResponse(RepositoryBuildResource,
+                        params=dict(repository=ADMIN_ACCESS_USER + '/simple', build_uuid=uuid),
+                        expected_code=201)
+
+    # Check for the build.
+    json = self.getJsonResponse(RepositoryBuildList,
+                                params=dict(repository=ADMIN_ACCESS_USER + '/simple'))
+
+    self.assertEquals(0, len(json['builds']))
+
+
+  def test_attemptcancel_scheduledbuild(self):
+    self.login(ADMIN_ACCESS_USER)
+
+    # Request a (fake) build.
+    json = self.postJsonResponse(RepositoryBuildList,
+                                 params=dict(repository=ADMIN_ACCESS_USER + '/simple'),
+                                 data=dict(file_id='foobarbaz'),
+                                 expected_code=201)
+
+    uuid = json['id']
+
+    # Check for the build.
+    json = self.getJsonResponse(RepositoryBuildList,
+                                params=dict(repository=ADMIN_ACCESS_USER + '/simple'))
+
+    self.assertEquals(1, len(json['builds']))
+    self.assertEquals(uuid, json['builds'][0]['id'])
+
+    # Set queue item to be picked up.
+    qi = database.QueueItem.get(id=1)
+    qi.available = False
+    qi.save()
+
+    # Try to cancel the build.
+    self.deleteResponse(RepositoryBuildResource,
+                        params=dict(repository=ADMIN_ACCESS_USER + '/simple', build_uuid=uuid),
+                        expected_code=400)
+
+
+  def test_attemptcancel_workingbuild(self):
+    self.login(ADMIN_ACCESS_USER)
+
+    # Request a (fake) build.
+    json = self.postJsonResponse(RepositoryBuildList,
+                                 params=dict(repository=ADMIN_ACCESS_USER + '/simple'),
+                                 data=dict(file_id='foobarbaz'),
+                                 expected_code=201)
+
+    uuid = json['id']
+
+    # Check for the build.
+    json = self.getJsonResponse(RepositoryBuildList,
+                                params=dict(repository=ADMIN_ACCESS_USER + '/simple'))
+
+    self.assertEquals(1, len(json['builds']))
+    self.assertEquals(uuid, json['builds'][0]['id'])
+
+    # Set the build to a different phase.
+    rb = database.RepositoryBuild.get(uuid=uuid)
+    rb.phase = database.BUILD_PHASE.BUILDING
+    rb.save()
+
+    # Try to cancel the build.
+    self.deleteResponse(RepositoryBuildResource,
+                        params=dict(repository=ADMIN_ACCESS_USER + '/simple', build_uuid=uuid),
+                        expected_code=400)
+
+
 class TestRepoBuilds(ApiTestCase):
   def test_getrepo_nobuilds(self):
     self.login(ADMIN_ACCESS_USER)