archive/attract
0
0
Fork 0
Code Issues 7 Pull Requests Projects Releases Wiki Activity

Python 3.6 compatibility: Applied 2to3

Browse Source
This commit is contained in:
Sybren A. Stüvel
2017-03-03 15:08:48 +01:00
parent cd17236428
commit 4e8c735f6b
14 changed files with 131 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
tests/test_subversion.py
View File

@@ -2,8 +2,6 @@
"""Unit test for SVN interface."""
from __future__ import absolute_import
import collections
import datetime
import logging.config
@@ -158,48 +156,48 @@ class TestCommitLogObserver(unittest.TestCase):
def test_create_log_entry(self):
from attract import subversion
entry = subversion.create_log_entry(date_text=u'2016-10-21 17:40:17 +0200',
msg=u'Ünicøde is good',
entry = subversion.create_log_entry(date_text='2016-10-21 17:40:17 +0200',
msg='Ünicøde is good',
revision='123',
author=u'børk',
author='børk',
changelist='nothing')
self.assertEqual(tuple(entry), (
datetime.datetime(2016, 10, 21, 15, 40, 17, 0, tzinfo=tzutc()),
u'Ünicøde is good',
'Ünicøde is good',
'123',
u'børk',
'børk',
'nothing'
))
self.assertRaises(ValueError, subversion.create_log_entry,
date_text='Unparseable date',
msg=u'Ünicøde is good',
msg='Ünicøde is good',
revision='123',
author=u'børk',
author='børk',
changelist='nothing')
entry = subversion.create_log_entry(date_text=u'2016-10-21 17:40:17 +0200',
msg=u'Ünicøde is good',
entry = subversion.create_log_entry(date_text='2016-10-21 17:40:17 +0200',
msg='Ünicøde is good',
revision='123',
author=u'børk')
author='børk')
self.assertEqual(tuple(entry), (
datetime.datetime(2016, 10, 21, 15, 40, 17, 0, tzinfo=tzutc()),
u'Ünicøde is good',
'Ünicøde is good',
'123',
u'børk',
'børk',
None
))
entry = subversion.create_log_entry(
date=datetime.datetime(2016, 10, 21, 15, 40, 17, 0, tzinfo=tzutc()),
msg=u'Ünicøde is good',
msg='Ünicøde is good',
revision='123',
author=u'børk')
author='børk')
self.assertEqual(tuple(entry), (
datetime.datetime(2016, 10, 21, 15, 40, 17, 0, tzinfo=tzutc()),
u'Ünicøde is good',
'Ünicøde is good',
'123',
u'børk',
'børk',
None
))
@@ -225,9 +223,9 @@ class PushCommitTest(AbstractAttractTest):
subversion.task_logged.connect(record_blink)
push_data = {
'repo': u'strange-repo™',
'repo': 'strange-repo™',
'revision': '4',
'msg': u'မြန်မာဘာသာ is beautiful.\n\nThis solves task [T431134]',
'msg': 'မြန်မာဘာသာ is beautiful.\n\nThis solves task [T431134]',
'author': 'Haha',
'date': '2016-10-21 17:40:17 +0200',
}
@@ -237,8 +235,8 @@ class PushCommitTest(AbstractAttractTest):
auth_token=token['token'])
self.assertEqual(1, len(blinks))
self.assertEqual(u'T431134', blinks[0]['shortcode'])
self.assertEqual(u'မြန်မာဘာသာ is beautiful.\n\nThis solves task [T431134]',
self.assertEqual('T431134', blinks[0]['shortcode'])
self.assertEqual('မြန်မာဘာသာ is beautiful.\n\nThis solves task [T431134]',
blinks[0]['log_entry'].msg)
self.assertEqual(datetime.datetime(2016, 10, 21, 15, 40, 17, 0, tzinfo=tzutc()),
blinks[0]['log_entry'].date)
@@ -283,7 +281,7 @@ class SvnTaskLoggedTest(AbstractAttractTest):
_, token = cli.create_svner_account('svner@example.com', self.project['url'])
# Do the push
msg = u'¡is a tie! commit to task [%s]' % shortcode
msg = '¡is a tie! commit to task [%s]' % shortcode
self.post('/attract/api/%s/subversion/log' % self.project['url'],
json={
'revision': 6,