Fix tests

This commit is contained in:
Joseph Schorr 2014-10-14 16:23:01 -04:00
parent efb3c6c494
commit b234019a02
2 changed files with 29 additions and 29 deletions

View file

@ -1072,17 +1072,17 @@ class TestBuildTriggerFieldValuesSwo1PublicPublicrepo(ApiTestCase):
self._set_url(BuildTriggerFieldValues, trigger_uuid="SWO1", repository="public/publicrepo", self._set_url(BuildTriggerFieldValues, trigger_uuid="SWO1", repository="public/publicrepo",
field_name="test_field") field_name="test_field")
def test_get_anonymous(self): def test_post_anonymous(self):
self._run_test('GET', 401, None, {}) self._run_test('POST', 401, None, {})
def test_get_freshuser(self): def test_post_freshuser(self):
self._run_test('GET', 403, 'freshuser', {}) self._run_test('POST', 403, 'freshuser', {})
def test_get_reader(self): def test_post_reader(self):
self._run_test('GET', 403, 'reader', {}) self._run_test('POST', 403, 'reader', {})
def test_get_devtable(self): def test_post_devtable(self):
self._run_test('GET', 403, 'devtable', {}) self._run_test('POST', 403, 'devtable', {})
class TestBuildTriggerFieldValuesSwo1DevtableShared(ApiTestCase): class TestBuildTriggerFieldValuesSwo1DevtableShared(ApiTestCase):
@ -1091,17 +1091,17 @@ class TestBuildTriggerFieldValuesSwo1DevtableShared(ApiTestCase):
self._set_url(BuildTriggerFieldValues, trigger_uuid="SWO1", repository="devtable/shared", self._set_url(BuildTriggerFieldValues, trigger_uuid="SWO1", repository="devtable/shared",
field_name="test_field") field_name="test_field")
def test_get_anonymous(self): def test_post_anonymous(self):
self._run_test('GET', 401, None, {}) self._run_test('POST', 401, None, {})
def test_get_freshuser(self): def test_post_freshuser(self):
self._run_test('GET', 403, 'freshuser', {}) self._run_test('POST', 403, 'freshuser', {})
def test_get_reader(self): def test_post_reader(self):
self._run_test('GET', 403, 'reader', {}) self._run_test('POST', 403, 'reader', {})
def test_get_devtable(self): def test_post_devtable(self):
self._run_test('GET', 404, 'devtable', {'config': {}}) self._run_test('POST', 404, 'devtable', {'config': {}})
class TestBuildTriggerFieldValuesSwo1BuynlargeOrgrepo(ApiTestCase): class TestBuildTriggerFieldValuesSwo1BuynlargeOrgrepo(ApiTestCase):
@ -1110,17 +1110,17 @@ class TestBuildTriggerFieldValuesSwo1BuynlargeOrgrepo(ApiTestCase):
self._set_url(BuildTriggerFieldValues, trigger_uuid="SWO1", repository="buynlarge/orgrepo", self._set_url(BuildTriggerFieldValues, trigger_uuid="SWO1", repository="buynlarge/orgrepo",
field_name="test_field") field_name="test_field")
def test_get_anonymous(self): def test_post_anonymous(self):
self._run_test('GET', 401, None, {}) self._run_test('POST', 401, None, {})
def test_get_freshuser(self): def test_post_freshuser(self):
self._run_test('GET', 403, 'freshuser', {}) self._run_test('POST', 403, 'freshuser', {})
def test_get_reader(self): def test_post_reader(self):
self._run_test('GET', 403, 'reader', {}) self._run_test('POST', 403, 'reader', {})
def test_get_devtable(self): def test_post_devtable(self):
self._run_test('GET', 404, 'devtable', {'config': {}}) self._run_test('POST', 404, 'devtable', {'config': {}})
class TestBuildTriggerSources831cPublicPublicrepo(ApiTestCase): class TestBuildTriggerSources831cPublicPublicrepo(ApiTestCase):

View file

@ -2152,7 +2152,7 @@ class TestBuildTriggers(ApiTestCase):
data={'config': trigger_config}) data={'config': trigger_config})
self.assertEquals('error', analyze_json['status']) self.assertEquals('error', analyze_json['status'])
self.assertEquals('Repository "localhost:5000/nothere/randomrepo" was not found', analyze_json['message']) self.assertEquals('Repository "localhost:5000/nothere/randomrepo" referenced by the Dockerfile was not found', analyze_json['message'])
# Analyze the trigger's dockerfile: Sixth, dockerfile with private repo that the user cannot see. # Analyze the trigger's dockerfile: Sixth, dockerfile with private repo that the user cannot see.
trigger_config = {'dockerfile': 'FROM localhost:5000/randomuser/randomrepo'} trigger_config = {'dockerfile': 'FROM localhost:5000/randomuser/randomrepo'}
@ -2161,7 +2161,7 @@ class TestBuildTriggers(ApiTestCase):
data={'config': trigger_config}) data={'config': trigger_config})
self.assertEquals('error', analyze_json['status']) self.assertEquals('error', analyze_json['status'])
self.assertEquals('Repository "localhost:5000/randomuser/randomrepo" was not found', analyze_json['message']) self.assertEquals('Repository "localhost:5000/randomuser/randomrepo" referenced by the Dockerfile was not found', analyze_json['message'])
# Analyze the trigger's dockerfile: Seventh, dockerfile with private repo that the user see. # Analyze the trigger's dockerfile: Seventh, dockerfile with private repo that the user see.
trigger_config = {'dockerfile': 'FROM localhost:5000/devtable/complex'} trigger_config = {'dockerfile': 'FROM localhost:5000/devtable/complex'}
@ -2225,13 +2225,13 @@ class TestBuildTriggers(ApiTestCase):
expected_code=400) expected_code=400)
# Retrieve values for a field. # Retrieve values for a field.
result = self.getJsonResponse(BuildTriggerFieldValues, result = self.postJsonResponse(BuildTriggerFieldValues,
params=dict(repository=ADMIN_ACCESS_USER + '/simple', params=dict(repository=ADMIN_ACCESS_USER + '/simple',
trigger_uuid=trigger.uuid, field_name="test_field")) trigger_uuid=trigger.uuid, field_name="test_field"))
self.assertEquals(result['values'], [1, 2, 3]) self.assertEquals(result['values'], [1, 2, 3])
self.getResponse(BuildTriggerFieldValues, self.postResponse(BuildTriggerFieldValues,
params=dict(repository=ADMIN_ACCESS_USER + '/simple', params=dict(repository=ADMIN_ACCESS_USER + '/simple',
trigger_uuid=trigger.uuid, field_name="another_field"), trigger_uuid=trigger.uuid, field_name="another_field"),
expected_code = 404) expected_code = 404)