[fedocal] master: pep8 run on test_fedocallib (8f26ca3)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 8f26ca371c24ea859700959f52bffc09e468e811
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Nov 8 22:52:17 2012 +0100
pep8 run on test_fedocallib
>---------------------------------------------------------------
fedocal/tests/test_fedocallib.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fedocal/tests/test_fedocallib.py b/fedocal/tests/test_fedocallib.py
index 6dff408..e9f31c7 100644
--- a/fedocal/tests/test_fedocallib.py
+++ b/fedocal/tests/test_fedocallib.py
@@ -80,6 +80,7 @@ class FakeUser(object):
"""
self.groups = groups
+
# pylint: disable=R0904
class Fedocallibtests(Modeltests):
""" Fedocallib tests. """
11 years
[fedocal] master: pep8 run on fedocal/tests/__init__ (51968b2)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 51968b24a63601f7a70abf55b80bf36f7f25ab2b
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Nov 8 22:52:00 2012 +0100
pep8 run on fedocal/tests/__init__
>---------------------------------------------------------------
fedocal/tests/__init__.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fedocal/tests/__init__.py b/fedocal/tests/__init__.py
index 16c1972..bf6f7dc 100644
--- a/fedocal/tests/__init__.py
+++ b/fedocal/tests/__init__.py
@@ -51,6 +51,7 @@ DB_PATH = '%s/test.db' % (os.path.dirname(
TODAY = get_start_week(date.today().year, date.today().month,
date.today().day) + timedelta(days=2)
+
class Modeltests(unittest.TestCase):
""" Model tests. """
11 years
[fedocal] master: pep8 run on fedoral/fedocallib/__init__ (9032043)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 9032043288dc4e1a30c3dbe71b3cd10961e61917
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Nov 8 22:46:45 2012 +0100
pep8 run on fedoral/fedocallib/__init__
>---------------------------------------------------------------
fedocal/fedocallib/__init__.py | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/fedocal/fedocallib/__init__.py b/fedocal/fedocallib/__init__.py
index a23d52d..c05ee3a 100644
--- a/fedocal/fedocallib/__init__.py
+++ b/fedocal/fedocallib/__init__.py
@@ -490,6 +490,7 @@ def add_meetings_to_vcal(ical, meetings):
for meeting in meetings:
add_meeting_to_vcal(ical, meeting)
+
def get_html_monthly_cal(day=None, month=None, year=None,
calendar_name=None):
""" Display a monthly calendar as HTML.
11 years
[fedocal] master: pep8 run on fedocal/__init__ (d7b9bd5)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit d7b9bd5a1174e15391e68dce21839da25039c348
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Nov 8 22:45:44 2012 +0100
pep8 run on fedocal/__init__
>---------------------------------------------------------------
fedocal/__init__.py | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index 75e1e90..44d0d8d 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -160,9 +160,10 @@ def calendar_fullday(calendar_name, year, month, day):
month_name = week_start.strftime('%B')
day_index = None
- today=datetime.date.today()
+ today = datetime.date.today()
if today > week_start and today < week_start + datetime.timedelta(days=7):
- day_index = fedocallib.get_week_day_index(today.year, today.month, today.day)
+ day_index = fedocallib.get_week_day_index(today.year,
+ today.month, today.day)
curmonth_cal = fedocallib.get_html_monthly_cal(year=year,
month=month, calendar_name=calendar_name)
11 years
[fedocal] master: pep8 doesn't like ## (ab4a77c)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit ab4a77c68de7044e1b8198e085480e7a71ec0049
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Nov 8 22:43:55 2012 +0100
pep8 doesn't like ##
>---------------------------------------------------------------
fedocal/fedocallib/model.py | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fedocal/fedocallib/model.py b/fedocal/fedocallib/model.py
index a11baf7..78a745e 100644
--- a/fedocal/fedocallib/model.py
+++ b/fedocal/fedocallib/model.py
@@ -130,7 +130,7 @@ class Meeting(BASE):
calendar_name = Column(String(80), ForeignKey('calendars.calendar_name'),
nullable=False)
calendar = relationship("Calendar")
- meeting_manager = Column(String(160)) ##5 person max (32 * 5)
+ meeting_manager = Column(String(160)) # 5 person max (32 * 5)
meeting_date = Column(Date, default=datetime.utcnow().date())
meeting_date_end = Column(Date, default=datetime.utcnow().date())
meeting_time_start = Column(Time, default=datetime.utcnow().time())
11 years
[fedocal] master: pylint and pep8 run on fedora_calendar (1975da6)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 1975da68f038f89fd45dd2c8d1460d9c03fa515b
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Nov 8 22:16:26 2012 +0100
pylint and pep8 run on fedora_calendar
>---------------------------------------------------------------
fedocal/fedocallib/fedora_calendar.py | 49 +++++++++++++++++----------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/fedocal/fedocallib/fedora_calendar.py b/fedocal/fedocallib/fedora_calendar.py
index 578bf7e..16055ef 100644
--- a/fedocal/fedocallib/fedora_calendar.py
+++ b/fedocal/fedocallib/fedora_calendar.py
@@ -45,7 +45,7 @@ class FedocalCalendar(HTMLCalendar):
else:
link_day = day
if self.calendar_name:
- link_day= '<a href="%s">%d</a>' % (flask.url_for(
+ link_day = '<a href="%s">%d</a>' % (flask.url_for(
'calendar_fullday',
calendar_name=self.calendar_name, year=self.year,
month=self.month, day=day), day)
@@ -58,6 +58,7 @@ class FedocalCalendar(HTMLCalendar):
return '<td class="%s">%s</td>' % (
self.cssclasses[weekday], link_day)
+ # pylint: disable=W0221
def formatweek(self, theweek, current=False):
""" Return a complete week as a table row.
@@ -65,45 +66,45 @@ class FedocalCalendar(HTMLCalendar):
week or not (the current week will have the css class:
current_week)
"""
- s = ''.join(self.formatday(d, wd) for (d, wd) in theweek)
+ string = ''.join(self.formatday(d, wd) for (d, wd) in theweek)
if current:
- return '<tr class="current_week">%s</tr>' % s
+ return '<tr class="current_week">%s</tr>' % string
else:
- return '<tr>%s</tr>' % s
-
+ return '<tr>%s</tr>' % string
def formatmonthname(self, theyear, themonth, withyear=True):
"""
Return a month name as a table row.
"""
if withyear:
- s = '%s %s' % (month_name[themonth], theyear)
+ string = '%s %s' % (month_name[themonth], theyear)
else:
- s = '%s' % month_name[themonth]
+ string = '%s' % month_name[themonth]
prev_month_lnk = '<a class="button" href="#"><</a>'
next_month_lnk = '<a class="button" href="#">></a>'
- return '<tr><th colspan="7" class="month">%s %s %s</th></tr>' % (prev_month_lnk, s, next_month_lnk)
-
+ return '<tr><th colspan="7" class="month">%s %s %s</th></tr>' % (
+ prev_month_lnk, string, next_month_lnk)
+ # pylint: disable=W0221
def formatmonth(self, withyear=True):
"""
Return a formatted month as a html valid table.
"""
- v = []
- a = v.append
- a('<table class="month">')
- a('\n')
- a(self.formatmonthname(self.year, self.month, withyear=withyear))
- a('\n')
- #a(self.formatweekheader())
- #a('\n')
+ values = []
+ item = values.append
+ item('<table class="month">')
+ item('\n')
+ item(self.formatmonthname(self.year, self.month, withyear=withyear))
+ item('\n')
+ #item(self.formatweekheader())
+ #item('\n')
for week in self.monthdays2calendar(self.year, self.month):
- days = [item[0] for item in week]
+ days = [day[0] for day in week]
if self.day in days:
- a(self.formatweek(week, current=True))
+ item(self.formatweek(week, current=True))
else:
- a(self.formatweek(week))
- a('\n')
- a('</table>')
- a('\n')
- return ''.join(v)
+ item(self.formatweek(week))
+ item('\n')
+ item('</table>')
+ item('\n')
+ return ''.join(values)
11 years
[fedocal] master: pylint and pep8 run on test_fedora_calendar (13354a8)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 13354a8785b81f0f7fd9e337e627f93f5d8cd8b9
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Nov 8 22:12:02 2012 +0100
pylint and pep8 run on test_fedora_calendar
>---------------------------------------------------------------
fedocal/tests/test_fedora_calendar.py | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/fedocal/tests/test_fedora_calendar.py b/fedocal/tests/test_fedora_calendar.py
index 5209f2d..735183e 100644
--- a/fedocal/tests/test_fedora_calendar.py
+++ b/fedocal/tests/test_fedora_calendar.py
@@ -40,13 +40,12 @@ sys.path.insert(0, os.path.join(os.path.dirname(
os.path.abspath(__file__)), '..'))
from fedocallib.fedora_calendar import FedocalCalendar
-from tests import Modeltests, DB_PATH
+from tests import Modeltests
class FedocalCalendartests(Modeltests):
""" fedora_calendar application tests. """
-
def test_formatday(self):
""" Test the formatday function. """
today = date.today()
@@ -87,7 +86,6 @@ class FedocalCalendartests(Modeltests):
def test_formatmonth(self):
""" Test the formatmonth function. """
- today = date.today()
cal = FedocalCalendar(2012, 1, 10)
self.assertEqual(cal.formatmonth(),
'<table class="month">\n<tr><th colspan="7" class="month">'\
11 years
[fedocal] master: pep8 run on test_flask_api (6d17598)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 6d175986252d4f537ca45ba3b05a50b62fb2fe34
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Nov 8 22:10:26 2012 +0100
pep8 run on test_flask_api
>---------------------------------------------------------------
fedocal/tests/test_flask_api.py | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/fedocal/tests/test_flask_api.py b/fedocal/tests/test_flask_api.py
index 8ffee8f..0f40c0a 100644
--- a/fedocal/tests/test_flask_api.py
+++ b/fedocal/tests/test_flask_api.py
@@ -106,17 +106,17 @@ class FlaskApitests(Modeltests):
def test_api_date(self):
""" Test the api_date function. """
end_date = TODAY + timedelta(days=11)
- output = self.app.get('/api/date/foobar/%s/%s' %(TODAY, end_date))
+ output = self.app.get('/api/date/foobar/%s/%s' % (TODAY, end_date))
self.assertEqual(output.status_code, 301)
- output = self.app.get('/api/date/foobar/%s/%s/' %(TODAY, end_date))
+ output = self.app.get('/api/date/foobar/%s/%s/' % (TODAY, end_date))
self.assertEqual(output.status_code, 200)
self.assertEqual(output.data,
'{ "retrieval": "notok", "meeting": []}')
self.__setup_db()
- output = self.app.get('/api/date/test_calendar/%s/%s/' %(TODAY,
+ output = self.app.get('/api/date/test_calendar/%s/%s/' % (TODAY,
end_date))
self.assertEqual(output.status_code, 200)
self.assertTrue('"retrieval": "ok"' in output.data)
@@ -127,7 +127,7 @@ class FlaskApitests(Modeltests):
self.assertEqual(output.data.count('meeting_name'), 4)
end_date = TODAY + timedelta(days=2)
- output = self.app.get('/api/date/test_calendar4/%s/%s/' %(TODAY,
+ output = self.app.get('/api/date/test_calendar4/%s/%s/' % (TODAY,
end_date))
self.assertEqual(output.status_code, 200)
self.assertTrue('"retrieval": "ok"' in output.data)
@@ -163,11 +163,11 @@ class FlaskApitests(Modeltests):
def test_api_place(self):
""" Test the api_place function. """
end_date = TODAY + timedelta(days=2)
- output = self.app.get('/api/place/EMEA/foobar/%s/%s' %(TODAY,
+ output = self.app.get('/api/place/EMEA/foobar/%s/%s' % (TODAY,
end_date))
self.assertEqual(output.status_code, 301)
- output = self.app.get('/api/place/EMEA/foobar/%s/%s/' %(TODAY,
+ output = self.app.get('/api/place/EMEA/foobar/%s/%s/' % (TODAY,
end_date))
self.assertEqual(output.status_code, 200)
self.assertEqual(output.data,
@@ -175,19 +175,19 @@ class FlaskApitests(Modeltests):
self.__setup_db()
- output = self.app.get('/api/place/APAC/test_calendar4/%s/%s/' %(
+ output = self.app.get('/api/place/APAC/test_calendar4/%s/%s/' % (
TODAY, end_date))
self.assertEqual(output.status_code, 200)
self.assertEqual(output.data,
'{ "retrieval": "notok", "meeting": []}')
- output = self.app.get('/api/place/NA/test_calendar4/%s/%s/' %(
+ output = self.app.get('/api/place/NA/test_calendar4/%s/%s/' % (
TODAY, end_date))
self.assertEqual(output.status_code, 200)
self.assertTrue('"retrieval": "ok"' in output.data)
self.assertEqual(output.data.count('meeting_name'), 1)
- output = self.app.get('/api/place/EMEA/test_calendar4/%s/%s/' %(
+ output = self.app.get('/api/place/EMEA/test_calendar4/%s/%s/' % (
TODAY, end_date))
self.assertEqual(output.status_code, 200)
self.assertTrue('"retrieval": "ok"' in output.data)
@@ -195,13 +195,13 @@ class FlaskApitests(Modeltests):
end_date = TODAY + timedelta(days=1)
- output = self.app.get('/api/place/NA/test_calendar4/%s/%s/' %(
+ output = self.app.get('/api/place/NA/test_calendar4/%s/%s/' % (
TODAY, end_date))
self.assertEqual(output.status_code, 200)
self.assertEqual(output.data,
'{ "retrieval": "notok", "meeting": []}')
- output = self.app.get('/api/place/EMEA/test_calendar4/%s/%s/' %(
+ output = self.app.get('/api/place/EMEA/test_calendar4/%s/%s/' % (
TODAY, end_date))
self.assertEqual(output.status_code, 200)
self.assertEqual(output.data,
11 years
[fedocal] master: pylint run on test_fedocallib (05d1891)
by pingou@fedorahosted.org
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit 05d18916d793a6be4d1e0577775a01985c1cf1c3
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Nov 8 22:04:32 2012 +0100
pylint run on test_fedocallib
>---------------------------------------------------------------
fedocal/tests/test_fedocallib.py | 62 ++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 19 deletions(-)
diff --git a/fedocal/tests/test_fedocallib.py b/fedocal/tests/test_fedocallib.py
index c71d329..6dff408 100644
--- a/fedocal/tests/test_fedocallib.py
+++ b/fedocal/tests/test_fedocallib.py
@@ -48,18 +48,28 @@ import fedocallib
from fedocallib import model
from tests import Modeltests, TODAY
-RESULT_CALENDAR_HTML = """
-<table class="month">
-<tr><th colspan="7" class="month"><a class="button" href="#"><</a> November 2012 <a class="button" href="#">></a></th></tr>
-<tr><td class="noday"> </td><td class="noday"> </td><td class="noday"> </td><td class="thu">1</td><td class="fri">2</td><td class="sat">3</td><td class="sun">4</td></tr>
-<tr><td class="mon">5</td><td class="tue">6</td><td class="wed">7</td><td class="thu">8</td><td class="fri">9</td><td class="sat">10</td><td class="sun">11</td></tr>
-<tr><td class="mon">12</td><td class="tue">13</td><td class="wed">14</td><td class="thu">15</td><td class="fri">16</td><td class="sat">17</td><td class="sun">18</td></tr>
-<tr><td class="mon">19</td><td class="tue">20</td><td class="wed">21</td><td class="thu">22</td><td class="fri">23</td><td class="sat">24</td><td class="sun">25</td></tr>
-<tr><td class="mon">26</td><td class="tue">27</td><td class="wed">28</td><td class="thu">29</td><td class="fri">30</td><td class="noday"> </td><td class="noday"> </td></tr>
-</table>
-"""
-
-
+RESULT_CALENDAR_HTML = '<table class="month">\n'\
+'<tr><th colspan="7" class="month"><a class="button" href="#"><'\
+'</a> November 2012 <a class="button" href="#">></a></th></tr>\n'\
+'<tr><td class="noday"> </td><td class="noday"> </td><td '\
+'class="noday"> </td><td class="thu">1</td><td class="fri">2</td>'\
+'<td class="sat">3</td><td class="sun">4</td></tr>\n'\
+'<tr><td class="mon">5</td><td class="tue">6</td><td class="wed">7'\
+'</td><td class="thu">8</td><td class="fri">9</td><td class="sat">10'\
+'</td><td class="sun">11</td></tr>\n'\
+'<tr><td class="mon">12</td><td class="tue">13</td><td class="wed">14'\
+'</td><td class="thu">15</td><td class="fri">16</td><td class="sat">17'\
+'</td><td class="sun">18</td></tr>\n'\
+'<tr><td class="mon">19</td><td class="tue">20</td><td class="wed">21'\
+'</td><td class="thu">22</td><td class="fri">23</td><td class="sat">24'\
+'</td><td class="sun">25</td></tr>\n'\
+'<tr><td class="mon">26</td><td class="tue">27</td><td class="wed">28'\
+'</td><td class="thu">29</td><td class="fri">30</td><td class="noday">'\
+' </td><td class="noday"> </td></tr>\n'\
+'</table>'
+
+
+# pylint: disable=R0903
class FakeUser(object):
""" Fake user used to test the fedocallib library. """
@@ -70,10 +80,12 @@ class FakeUser(object):
"""
self.groups = groups
-
+# pylint: disable=R0904
class Fedocallibtests(Modeltests):
""" Fedocallib tests. """
+ session = None
+
def __setup_calendar(self):
""" Set up basic calendar information. """
from test_calendar import Calendartests
@@ -177,6 +189,7 @@ class Fedocallibtests(Modeltests):
self.assertNotEqual(days, None)
self.assertEqual(days, expectdays)
+ # pylint: disable=R0912
def test_get_meetings(self):
""" Test the get_meetings function. """
self.__setup_meeting()
@@ -226,6 +239,7 @@ class Fedocallibtests(Modeltests):
self.assertEqual(cnt, 6)
self.assertEqual(meetings['19h00'][0], None)
+ # pylint: disable=C0103
def test_get_meetings_with_multiple_same_time(self):
""" Test the get_meetings function when there are several
meetings at the same time. """
@@ -299,6 +313,7 @@ class Fedocallibtests(Modeltests):
self.assertEqual(meetings[0].meeting_information,
'This is a past test meeting')
+ # pylint: disable=C0103
def test_get_future_single_meeting_of_user(self):
""" Test the get_future_single_meeting_of_user function. """
self.__setup_meeting()
@@ -318,6 +333,7 @@ class Fedocallibtests(Modeltests):
self.assertEqual(meetings[2].meeting_information,
'This is a test meeting with reminder')
+ # pylint: disable=C0103
def test_get_future_single_meeting_of_user_empty(self):
""" Test the get_future_single_meeting_of_user function on a
empty meeting table. """
@@ -328,6 +344,7 @@ class Fedocallibtests(Modeltests):
self.assertEqual(len(meetings), 0)
self.assertEqual(meetings, [])
+ # pylint: disable=C0103
def test_get_future_regular_meeting_of_user(self):
""" Test the get_future_regular_meeting_of_user function. """
self.__setup_meeting()
@@ -348,6 +365,7 @@ class Fedocallibtests(Modeltests):
self.assertEqual(meetings[2].meeting_information,
'This is a test meeting with recursion and reminder')
+ # pylint: disable=C0103
def test_get_future_regular_meeting_of_user_empty(self):
""" Test the get_future_regular_meeting_of_user function on a
empty meeting table. """
@@ -374,6 +392,7 @@ class Fedocallibtests(Modeltests):
self.assertEqual(meeting.meeting_name, 'Another test meeting2')
self.assertEqual(meeting.recursion_ends, date.today())
+ # pylint: disable=C0103
def test_delete_recursive_meeting_past(self):
""" Test the delete_recursive_meeting for past end_datefunction.
"""
@@ -408,10 +427,10 @@ class Fedocallibtests(Modeltests):
self.assertTrue(fedocallib.agenda_is_free(self.session, cal,
TODAY, 10, 11))
+ # pylint: disable=C0103
def test_is_user_managing_in_calendar(self):
""" Test the is_user_managing_in_calendar function. """
self.__setup_calendar()
- cal = model.Calendar.by_id(self.session, 'test_calendar')
user = FakeUser(['packager', 'fi-apprentice'])
self.assertTrue(fedocallib.is_user_managing_in_calendar(
self.session, 'test_calendar', user))
@@ -462,6 +481,7 @@ class Fedocallibtests(Modeltests):
self.assertEqual(meetings[0].meeting_information,
'This is a test meeting with reminder')
+ # pylint: disable=C0103
def test_retrieve_meeting_to_remind_empty(self):
""" Test the retrieve_meeting_to_remind function on an empty
meeting table. """
@@ -506,6 +526,7 @@ class Fedocallibtests(Modeltests):
'Another test meeting', 'Test meeting with reminder'])
self.assertEqual(meeting.meeting_manager, 'pingou')
+ # pylint: disable=C0103
def test_get_meetings_by_date_and_region(self):
""" Test the get_meetings_by_date_and_region function. """
self.__setup_meeting()
@@ -555,17 +576,20 @@ class Fedocallibtests(Modeltests):
def test_get_html_monthly_cal(self):
""" Test the get_html_monthly_call function. """
today = date.today()
- output = fedocallib.get_html_monthly_cal(today.day,today.month,
+ output = fedocallib.get_html_monthly_cal(today.day, today.month,
today.year)
# Handle the today css class
expected_output = RESULT_CALENDAR_HTML.replace(
'class="%s">%s' % (today.strftime('%a').lower(), today.day),
- 'class="%s today">%s'% (today.strftime('%a').lower(), today.day))
+ 'class="%s today">%s' % (today.strftime('%a').lower(),
+ today.day))
# Handle the change of month
expected_output = expected_output.replace(
- 'class="month"><a class="button" href="#"><</a> November 2012 <a class="button" href="#">></a></th>',
- 'class="month"><a class="button" href="#"><</a> %s %s <a class="button" href="#">></a></th>' % (today.strftime('%B'),
- today.year))
+ 'class="month"><a class="button" href="#"><</a> '\
+ 'November 2012 <a class="button" href="#">></a></th>',
+ 'class="month"><a class="button" href="#"><</a> %s %s '\
+ '<a class="button" href="#">></a></th>' % (
+ today.strftime('%B'), today.year))
# Handle the current_week css class
expected_output = expected_output.split('\n')
cnt = 0
11 years
[fedocal] master: pylint run on test_flask (e9d922e)
by Pierre-YvesChibon
Repository : http://git.fedorahosted.org/cgit/fedocal.git
On branch : master
>---------------------------------------------------------------
commit e9d922e492293170f952017d652a83cd01f8d17b
Author: Pierre-Yves Chibon <pingou(a)pingoured.fr>
Date: Thu Nov 8 21:53:15 2012 +0100
pylint run on test_flask
>---------------------------------------------------------------
fedocal/tests/test_flask.py | 127 +++++++++++++++++++++----------------------
1 files changed, 62 insertions(+), 65 deletions(-)
diff --git a/fedocal/tests/test_flask.py b/fedocal/tests/test_flask.py
index 571e35b..0d2e139 100644
--- a/fedocal/tests/test_flask.py
+++ b/fedocal/tests/test_flask.py
@@ -35,9 +35,6 @@ import sys
import os
from datetime import date
-from datetime import time
-from datetime import datetime
-from datetime import timedelta
sys.path.insert(0, os.path.join(os.path.dirname(
os.path.abspath(__file__)), '..', '..'))
@@ -45,12 +42,13 @@ sys.path.insert(0, os.path.join(os.path.dirname(
import fedocal
import fedocal.fedocallib as fedocallib
from fedocal.tests import Modeltests, DB_PATH
-from test_fedocallib import FakeUser
class Flasktests(Modeltests):
""" Flask application tests. """
+ session = None
+
def __setup_db(self):
""" Add a calendar and some meetings so that we can play with
something. """
@@ -70,122 +68,121 @@ class Flasktests(Modeltests):
def test_index_empty(self):
""" Test the index function. """
- rv = self.app.get('/')
- self.assertEqual(rv.status_code, 200)
+ output = self.app.get('/')
+ self.assertEqual(output.status_code, 200)
self.assertTrue(
- '<title> - Fedocal</title>' in rv.data)
+ '<title> - Fedocal</title>' in output.data)
def test_index(self):
""" Test the index function. """
self.__setup_db()
- rv = self.app.get('/')
- self.assertEqual(rv.status_code, 200)
+ output = self.app.get('/')
+ self.assertEqual(output.status_code, 200)
self.assertTrue(
- '<title> test_calendar - Fedocal</title>' in rv.data)
- self.assertTrue(' <a href="/test_calendar/">' in rv.data)
- self.assertTrue(' <a href="/test_calendar2/">' in rv.data)
- self.assertTrue(' <a href="/test_calendar4/">' in rv.data)
+ '<title> test_calendar - Fedocal</title>' in output.data)
+ self.assertTrue(' <a href="/test_calendar/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar2/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar4/">' in output.data)
def test_calendar(self):
""" Test the calendar function. """
self.__setup_db()
- rv = self.app.get('/test_calendar')
- self.assertEqual(rv.status_code, 301)
+ output = self.app.get('/test_calendar')
+ self.assertEqual(output.status_code, 301)
- rv = self.app.get('/test_calendar', follow_redirects=True)
- self.assertEqual(rv.status_code, 200)
+ output = self.app.get('/test_calendar', follow_redirects=True)
+ self.assertEqual(output.status_code, 200)
self.assertTrue(
- '<title> test_calendar - Fedocal</title>' in rv.data)
- self.assertTrue(' <a href="/test_calendar/">' in rv.data)
- self.assertTrue(' <a href="/test_calendar2/">' in rv.data)
- self.assertTrue(' <a href="/test_calendar4/">' in rv.data)
+ '<title> test_calendar - Fedocal</title>' in output.data)
+ self.assertTrue(' <a href="/test_calendar/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar2/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar4/">' in output.data)
- rv = self.app.get('/test_calendar2/')
- self.assertEqual(rv.status_code, 200)
+ output = self.app.get('/test_calendar2/')
+ self.assertEqual(output.status_code, 200)
self.assertTrue(
- '<title> test_calendar2 - Fedocal</title>' in rv.data)
- self.assertTrue(' <a href="/test_calendar/">' in rv.data)
- self.assertTrue(' <a href="/test_calendar2/">' in rv.data)
- self.assertTrue(' <a href="/test_calendar4/">' in rv.data)
+ '<title> test_calendar2 - Fedocal</title>' in output.data)
+ self.assertTrue(' <a href="/test_calendar/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar2/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar4/">' in output.data)
def test_calendar_fullday(self):
""" Test the calendar_fullday function. """
self.__setup_db()
today = date.today()
- rv = self.app.get('/test_calendar/%s/%s/%s/' % (today.year,
+ output = self.app.get('/test_calendar/%s/%s/%s/' % (today.year,
today.month, today.day))
- self.assertEqual(rv.status_code, 200)
+ self.assertEqual(output.status_code, 200)
self.assertTrue(
- '<title> test_calendar - Fedocal</title>' in rv.data)
- self.assertTrue(' <a href="/test_calendar/">' in rv.data)
- self.assertTrue(' <a href="/test_calendar2/">' in rv.data)
- self.assertTrue(' <a href="/test_calendar4/">' in rv.data)
+ '<title> test_calendar - Fedocal</title>' in output.data)
+ self.assertTrue(' <a href="/test_calendar/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar2/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar4/">' in output.data)
- rv = self.app.get('/test_calendar/%s/%s/%s' % (today.year,
+ output = self.app.get('/test_calendar/%s/%s/%s' % (today.year,
today.month, today.day))
- self.assertEqual(rv.status_code, 301)
+ self.assertEqual(output.status_code, 301)
- rv = self.app.get('/test_calendar/%s/%s/%s/' % (today.year,
+ output = self.app.get('/test_calendar/%s/%s/%s/' % (today.year,
today.month, today.day), follow_redirects=True)
- self.assertEqual(rv.status_code, 200)
+ self.assertEqual(output.status_code, 200)
self.assertTrue(
- '<title> test_calendar - Fedocal</title>' in rv.data)
- self.assertTrue(' <a href="/test_calendar/">' in rv.data)
- self.assertTrue(' <a href="/test_calendar2/">' in rv.data)
- self.assertTrue(' <a href="/test_calendar4/">' in rv.data)
+ '<title> test_calendar - Fedocal</title>' in output.data)
+ self.assertTrue(' <a href="/test_calendar/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar2/">' in output.data)
+ self.assertTrue(' <a href="/test_calendar4/">' in output.data)
def test_ical_out(self):
""" Test the ical_out function. """
self.__setup_db()
- today = date.today()
- rv = self.app.get('/ical/test_calendar/')
- self.assertEqual(rv.status_code, 200)
- self.assertTrue('BEGIN:VCALENDAR' in rv.data)
- self.assertTrue('SUMMARY:test-meeting2' in rv.data)
+ output = self.app.get('/ical/test_calendar/')
+ self.assertEqual(output.status_code, 200)
+ self.assertTrue('BEGIN:VCALENDAR' in output.data)
+ self.assertTrue('SUMMARY:test-meeting2' in output.data)
self.assertTrue('DESCRIPTION:This is a test meeting with '\
- 'recursion' in rv.data)
- self.assertTrue('ORGANIZER:pingou' in rv.data)
- self.assertEqual(rv.data.count('BEGIN:VEVENT'), 6)
- self.assertEqual(rv.data.count('END:VEVENT'), 6)
+ 'recursion' in output.data)
+ self.assertTrue('ORGANIZER:pingou' in output.data)
+ self.assertEqual(output.data.count('BEGIN:VEVENT'), 6)
+ self.assertEqual(output.data.count('END:VEVENT'), 6)
def test_view_meeting(self):
""" Test the view_meeting function. """
self.__setup_db()
- rv = self.app.get('/meeting/4/')
- self.assertEqual(rv.status_code, 200)
+ output = self.app.get('/meeting/4/')
+ self.assertEqual(output.status_code, 200)
self.assertTrue('<title> test-meeting-st-1 - Fedocal</title>' \
- in rv.data)
+ in output.data)
self.assertTrue('<h4> Meeting: test-meeting-st-1</h4>' \
- in rv.data)
+ in output.data)
self.assertTrue('This is a test meeting at the same time' in
- rv.data)
+ output.data)
def test_view_meeting_page(self):
""" Test the view_meeting_page function. """
self.__setup_db()
- rv = self.app.get('/meeting/4/1/')
- self.assertEqual(rv.status_code, 200)
+ output = self.app.get('/meeting/4/1/')
+ self.assertEqual(output.status_code, 200)
self.assertTrue('<title> test-meeting-st-1 - Fedocal</title>' \
- in rv.data)
+ in output.data)
self.assertTrue('<h4> Meeting: test-meeting-st-1</h4>' \
- in rv.data)
+ in output.data)
self.assertTrue('This is a test meeting at the same time' in
- rv.data)
+ output.data)
- rv = self.app.get('/meeting/4/0/')
- self.assertEqual(rv.status_code, 200)
+ output = self.app.get('/meeting/4/0/')
+ self.assertEqual(output.status_code, 200)
self.assertTrue('<title> test-meeting-st-1 - Fedocal</title>' \
- not in rv.data)
+ not in output.data)
self.assertTrue('<h4> Meeting: test-meeting-st-1</h4>' \
- in rv.data)
+ in output.data)
self.assertTrue('This is a test meeting at the same time' in
- rv.data)
+ output.data)
if __name__ == '__main__':
11 years