Skip to content

Commit 64501d8

Browse files
authored
Merge pull request #2983 from uw-it-aca/qa
Qa
2 parents 662b2c8 + 8f82b0d commit 64501d8

File tree

2 files changed

+9
-5
lines changed

2 files changed

+9
-5
lines changed

myuw/management/commands/db_cleanup.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def course_display(self):
7171
# clean up after one year
7272
timer = Timer()
7373
queryf = "DELETE FROM user_course_display_pref WHERE id IN ({})"
74-
term = get_term_by_date(sws_now())
74+
term = get_term_by_date(sws_now().date())
7575
y = term.year - 1
7676
q = term.quarter
7777
qset = UserCourseDisplay.objects.filter(year=y, quarter=q)
@@ -103,7 +103,7 @@ def registration_seen(self):
103103
# clean up previous quarters'
104104
timer = Timer()
105105
queryf = "DELETE FROM myuw_mobile_seenregistration WHERE id IN ({})"
106-
term = get_term_before(get_term_by_date(sws_now()))
106+
term = get_term_before(get_term_by_date(sws_now().date()))
107107
qset = SeenRegistration.objects.filter(
108108
year=term.year, quarter=term.quarter)
109109
if qset.exists():

myuw/test/management/commands/test_db_cleanup.py

+7-3
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,16 @@
33

44
from django.test import TestCase
55
from django.core.management import call_command
6+
from unittest.mock import patch
7+
from uw_sws.term import get_specific_term
68

79

810
class TestCheckResLinks(TestCase):
911

10-
def test_run(self):
11-
# call_command('db_cleanup', "course")
12-
# call_command('db_cleanup', "seenreg")
12+
@patch('myuw.dao.term.get_term_by_date', spec=True)
13+
def test_run(self, mock):
14+
mock.return_value = get_specific_term(2014, 'spring')
15+
call_command('db_cleanup', "course")
16+
call_command('db_cleanup', "seenreg")
1317
call_command('db_cleanup', "notice")
1418
call_command('db_cleanup', "linkvisit")

0 commit comments

Comments
 (0)