Merge pull request #2282 from coreos-inc/motd-updates

Severity and Markdown support in MOTD
This commit is contained in:
josephschorr 2017-01-18 17:41:27 -05:00 committed by GitHub
commit e2748fccd9
13 changed files with 234 additions and 36 deletions

Binary file not shown.

View file

@ -4295,6 +4295,25 @@ class TestSuperUserManagement(ApiTestCase):
self._run_test('DELETE', 204, 'devtable', None)
class TestSuperUserMessages(ApiTestCase):
def setUp(self):
ApiTestCase.setUp(self)
self._set_url(GlobalUserMessages)
self.message = {'message': {'content': '', 'severity': 'info', 'media_type': 'text/plain'}}
def test_post_anonymous(self):
self._run_test('POST', 401, None, None)
def test_post_freshuser(self):
self._run_test('POST', 403, 'freshuser', self.message)
def test_post_reader(self):
self._run_test('POST', 403, 'reader', self.message)
def test_post_devtable(self):
self._run_test('POST', 201, 'devtable', self.message)
class TestSuperUserMessage(ApiTestCase):
def setUp(self):
ApiTestCase.setUp(self)

View file

@ -4733,14 +4733,18 @@ class TestSuperUserManagement(ApiTestCase):
self.login(ADMIN_ACCESS_USER)
# Create a message
self.postResponse(GlobalUserMessages, data=dict(message={"content": "new message"}), expected_code=201)
message = {"content": "new message", "severity": "info", "media_type": "text/plain"}
self.postResponse(GlobalUserMessages, data=dict(message=message), expected_code=201)
json = self.getJsonResponse(GlobalUserMessages)
self.assertEquals(len(json['messages']), 3)
self.assertEquals(len(json['messages']), 2)
self.assertEquals(json['messages'][1]["content"], "new message")
self.assertNotEqual(json['messages'][0]["content"], json['messages'][1]["content"])
self.assertTrue(json['messages'][1]["uuid"])
self.assertEquals(json['messages'][2]["content"], "new message")
self.assertEquals(json['messages'][2]["severity"], "info")
self.assertEquals(json['messages'][2]["media_type"], "text/plain")
self.assertNotEqual(json['messages'][0]["content"], json['messages'][2]["content"])
self.assertTrue(json['messages'][2]["uuid"])
def test_delete_message(self):
self.login(ADMIN_ACCESS_USER)
@ -4749,7 +4753,7 @@ class TestSuperUserManagement(ApiTestCase):
json = self.getJsonResponse(GlobalUserMessages)
self.assertEquals(len(json['messages']), 0)
self.assertEquals(len(json['messages']), 1)
if __name__ == '__main__':
unittest.main()