Summit

Merge lp:~mhall119/summit/fix-tests into lp:summit

  1. fix-tests
  2. Merge into trunk
Proposed by Michael Hall
Status: Merged
Approved by: Chris Johnston
Approved revision: 508
Merged at revision: 507
Proposed branch: lp:~mhall119/summit/fix-tests
Merge into: lp:summit
Diff against target: 87 lines (+13/-11)
3 files modified
summit/schedule/models/summitmodel.py (+1/-1)
summit/schedule/tests/autoscheduler.py (+4/-4)
summit/schedule/tests/schedule.py (+8/-6)
To merge this branch: bzr merge lp:~mhall119/summit/fix-tests
Reviewer Review Type Date Requested Status
Chris Johnston Approve
Review via email: mp+153273@code.launchpad.net

Commit message

Fixes tests that were not passing, or passing intermittently

Description of the change

Fixes tests that were not passing, or passing intermittently

To post a comment you must log in.
lp:~mhall119/summit/fix-tests updated
508. By Michael Hall

Fix test to keep times all in the same day

Revision history for this message
Chris Johnston (cjohnston) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'summit/schedule/models/summitmodel.py'
2--- summit/schedule/models/summitmodel.py 2013-02-26 20:00:45 +0000
3+++ summit/schedule/models/summitmodel.py 2013-03-15 00:09:21 +0000
4@@ -459,7 +459,7 @@
5
6 def reschedule(self):
7 """Delete any automatically created agenda items that have problems."""
8- today = datetime.now()
9+ today = datetime.utcnow()
10 for meeting in self.meeting_set.all():
11 for agenda in meeting.agenda_set.filter(
12 auto=True,
13
14=== modified file 'summit/schedule/tests/autoscheduler.py'
15--- summit/schedule/tests/autoscheduler.py 2013-02-27 03:46:05 +0000
16+++ summit/schedule/tests/autoscheduler.py 2013-03-15 00:09:21 +0000
17@@ -69,7 +69,7 @@
18 room=self.room1
19 )
20
21- self.room2 = factory.make_one(Room, summit=self.summit, type='open')
22+ self.room2 = factory.make_one(Room, summit=self.summit, type='open', name='testroom')
23 self.meeting2 = factory.make_one(
24 Meeting,
25 summit=self.summit,
26@@ -90,7 +90,7 @@
27 summit=self.summit,
28 user=self.user,
29 start_utc=now,
30- end_utc=now+week
31+ end_utc=now+week+one_hour
32 )
33
34 def tearDown(self):
35@@ -167,8 +167,8 @@
36
37 self.run_reschedule()
38
39- self.assertEquals(0, self.meeting1.agenda_set.all().count())
40- self.assertEquals(0, self.meeting2.agenda_set.all().count())
41+ # Only one should be un-scheduled, but which one is random
42+ self.assertEquals(1, self.meeting1.agenda_set.all().count() + self.meeting2.agenda_set.all().count())
43
44 def test_get_participants_by_level(self):
45 participant1 = Participant.objects.create(
46
47=== modified file 'summit/schedule/tests/schedule.py'
48--- summit/schedule/tests/schedule.py 2013-02-27 03:39:43 +0000
49+++ summit/schedule/tests/schedule.py 2013-03-15 00:09:21 +0000
50@@ -496,6 +496,8 @@
51
52 def test_calculate_passes_with_multiple_plenary_rooms_if_editing(self):
53 now = datetime.datetime.utcnow()
54+ if now.hour >= 22:
55+ now.replace(hour=now.hour-2)
56 one_hour = datetime.timedelta(hours=1)
57 summit = factory.make_one(
58 Summit,
59@@ -507,22 +509,22 @@
60 Slot,
61 summit=summit,
62 type='plenary',
63- start_utc=now-(2*one_hour),
64- end_utc=now-(1*one_hour)
65+ start_utc=now+(1*one_hour),
66+ end_utc=now+(2*one_hour)
67 )
68 room1 = factory.make_one(
69 Room,
70 summit=summit,
71 type='plenary',
72- start_utc=now-(2*one_hour),
73- end_utc=now-(1*one_hour)
74+ start_utc=now+(1*one_hour),
75+ end_utc=now+(2*one_hour)
76 )
77 room2 = factory.make_one(
78 Room,
79 summit=summit,
80 type='plenary',
81- start_utc=now-(2*one_hour),
82- end_utc=now-(1*one_hour)
83+ start_utc=now+(1*one_hour),
84+ end_utc=now+(2*one_hour)
85 )
86 schedule = self.get_schedule(
87 edit=True,

Subscribers

People subscribed via source and target branches