mirror of
https://github.com/topydo/topydo.git
synced 2024-05-20 05:48:35 +00:00
Mock arrow.now() in the tests
As discovered by @davesteele, `arrow.now()` is not freezed to UTC with freezegun. We have to mock it so the humanized dates in tests are calculated properly.
This commit is contained in:
parent
8f71fffba1
commit
423288a764
|
@ -21,6 +21,7 @@ import sys
|
|||
import unittest
|
||||
from collections import namedtuple
|
||||
|
||||
import arrow
|
||||
from freezegun import freeze_time
|
||||
|
||||
from topydo.commands.ListCommand import ListCommand
|
||||
|
@ -607,7 +608,10 @@ class ListCommandDotTest(CommandTest):
|
|||
def setUp(self):
|
||||
self.maxDiff = None
|
||||
|
||||
def test_dot(self):
|
||||
@mock.patch('arrow.now') # arrow.now() doesn't freeze at UTC
|
||||
def test_dot(self, mock_arrow):
|
||||
mock_arrow.return_value = arrow.utcnow() # force arrow to UTC
|
||||
|
||||
todolist = load_file_to_todolist("test/data/ListCommandDotTest.txt")
|
||||
|
||||
command = ListCommand(["-x", "-f", "dot"], todolist, self.out,
|
||||
|
@ -669,7 +673,10 @@ l: 1
|
|||
| 5| Different item l:1 test:test_group2
|
||||
""")
|
||||
|
||||
def test_group3(self):
|
||||
@mock.patch('arrow.now')
|
||||
def test_group3(self, mock_arrow):
|
||||
mock_arrow.return_value = arrow.utcnow()
|
||||
|
||||
todolist = load_file_to_todolist("test/data/ListCommandGroupTest.txt")
|
||||
|
||||
command = ListCommand(["-g", "due", "test:test_group3"], todolist, self.out, self.error)
|
||||
|
@ -687,7 +694,10 @@ due: in a day
|
|||
| 8| Test 2 test:test_group3 due:2016-12-07
|
||||
""")
|
||||
|
||||
def test_group4(self):
|
||||
@mock.patch('arrow.now')
|
||||
def test_group4(self, mock_arrow):
|
||||
mock_arrow.return_value = arrow.utcnow()
|
||||
|
||||
todolist = load_file_to_todolist("test/data/ListCommandGroupTest.txt")
|
||||
|
||||
command = ListCommand(["-g", "t", "test:test_group4"], todolist, self.out, self.error)
|
||||
|
@ -701,7 +711,10 @@ t: today
|
|||
| 9| Test 1 test:test_group4 test:test_group5 t:2016-12-06
|
||||
""")
|
||||
|
||||
def test_group5(self):
|
||||
@mock.patch('arrow.now')
|
||||
def test_group5(self, mock_arrow):
|
||||
mock_arrow.return_value = arrow.utcnow()
|
||||
|
||||
todolist = load_file_to_todolist("test/data/ListCommandGroupTest.txt")
|
||||
|
||||
command = ListCommand(["-x", "-g", "t", "test:test_group5"], todolist, self.out, self.error)
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
import unittest
|
||||
from collections import namedtuple
|
||||
|
||||
import arrow
|
||||
from freezegun import freeze_time
|
||||
|
||||
from topydo.commands.ListCommand import ListCommand
|
||||
|
@ -126,9 +127,11 @@ class ListFormatTest(CommandTest):
|
|||
|
||||
self.assertEqual(self.output, result)
|
||||
|
||||
@mock.patch('arrow.now') # arrow.now() doesn't freeze at UTC
|
||||
@mock.patch('topydo.lib.ListFormat.get_terminal_size')
|
||||
def test_list_format06(self, mock_terminal_size):
|
||||
def test_list_format06(self, mock_terminal_size, mock_arrow):
|
||||
mock_terminal_size.return_value = self.terminal_size(100, 25)
|
||||
mock_arrow.return_value = arrow.utcnow() # force arrow to UTC
|
||||
|
||||
config(p_overrides={('ls', 'list_format'): '|%I| %x %p %S %k %{(}H{)}'})
|
||||
command = ListCommand(["-x"], self.todolist, self.out, self.error)
|
||||
|
@ -143,9 +146,11 @@ class ListFormatTest(CommandTest):
|
|||
"""
|
||||
self.assertEqual(self.output, result)
|
||||
|
||||
@mock.patch('arrow.now')
|
||||
@mock.patch('topydo.lib.ListFormat.get_terminal_size')
|
||||
def test_list_format07(self, mock_terminal_size):
|
||||
def test_list_format07(self, mock_terminal_size, mock_arrow):
|
||||
mock_terminal_size.return_value = self.terminal_size(100, 25)
|
||||
mock_arrow.return_value = arrow.utcnow()
|
||||
|
||||
config(p_overrides={('ls', 'list_format'): '|%I| %x %p %S %k %{(}h{)}'})
|
||||
command = ListCommand(["-x"], self.todolist, self.out, self.error)
|
||||
|
@ -177,9 +182,11 @@ x 2014-12-12
|
|||
"""
|
||||
self.assertEqual(self.output, result)
|
||||
|
||||
@mock.patch('arrow.now')
|
||||
@mock.patch('topydo.lib.ListFormat.get_terminal_size')
|
||||
def test_list_format09(self, mock_terminal_size):
|
||||
def test_list_format09(self, mock_terminal_size, mock_arrow):
|
||||
mock_terminal_size.return_value = self.terminal_size(100, 25)
|
||||
mock_arrow.return_value = arrow.utcnow()
|
||||
|
||||
config(p_overrides={('ls', 'list_format'): '%C | %D | %T | %X'})
|
||||
command = ListCommand(["-x"], self.todolist, self.out, self.error)
|
||||
|
@ -276,7 +283,10 @@ today | in 2 days | in a day |
|
|||
"""
|
||||
self.assertEqual(self.output, result)
|
||||
|
||||
def test_list_format16(self):
|
||||
@mock.patch('arrow.now')
|
||||
def test_list_format16(self, mock_arrow):
|
||||
mock_arrow.return_value = arrow.utcnow()
|
||||
|
||||
command = ListCommand(["-x", "-F", "%C"], self.todolist, self.out, self.error)
|
||||
command.execute()
|
||||
|
||||
|
@ -302,7 +312,10 @@ today
|
|||
"""
|
||||
self.assertEqual(self.output, result)
|
||||
|
||||
def test_list_format18(self):
|
||||
@mock.patch('arrow.now')
|
||||
def test_list_format18(self, mock_arrow):
|
||||
mock_arrow.return_value = arrow.utcnow()
|
||||
|
||||
command = ListCommand(["-x", "-F", "%D"], self.todolist, self.out, self.error)
|
||||
command.execute()
|
||||
|
||||
|
@ -315,7 +328,10 @@ in 2 days
|
|||
"""
|
||||
self.assertEqual(self.output, result)
|
||||
|
||||
def test_list_format19(self):
|
||||
@mock.patch('arrow.now')
|
||||
def test_list_format19(self, mock_arrow):
|
||||
mock_arrow.return_value = arrow.utcnow()
|
||||
|
||||
command = ListCommand(["-x", "-F", "%h"], self.todolist, self.out, self.error)
|
||||
command.execute()
|
||||
|
||||
|
@ -328,7 +344,10 @@ due in 2 days, starts in a day
|
|||
"""
|
||||
self.assertEqual(self.output, result)
|
||||
|
||||
def test_list_format20(self):
|
||||
@mock.patch('arrow.now')
|
||||
def test_list_format20(self, mock_arrow):
|
||||
mock_arrow.return_value = arrow.utcnow()
|
||||
|
||||
command = ListCommand(["-x", "-F", "%H"], self.todolist, self.out, self.error)
|
||||
command.execute()
|
||||
|
||||
|
@ -448,7 +467,10 @@ Completed but with
|
|||
"""
|
||||
self.assertEqual(self.output, result)
|
||||
|
||||
def test_list_format29(self):
|
||||
@mock.patch('arrow.now')
|
||||
def test_list_format29(self, mock_arrow):
|
||||
mock_arrow.return_value = arrow.utcnow()
|
||||
|
||||
command = ListCommand(["-x", "-F", "%T"], self.todolist, self.out, self.error)
|
||||
command.execute()
|
||||
|
||||
|
@ -681,10 +703,12 @@ C -
|
|||
"""
|
||||
self.assertEqual(self.output, result)
|
||||
|
||||
@mock.patch('arrow.now')
|
||||
@mock.patch('topydo.lib.ListFormat.get_terminal_size')
|
||||
def test_list_format45(self, mock_terminal_size):
|
||||
def test_list_format45(self, mock_terminal_size, mock_arrow):
|
||||
""" Colorblocks should not affect truncating or right_alignment. """
|
||||
mock_terminal_size.return_value = self.terminal_size(100, 25)
|
||||
mock_arrow.return_value = arrow.utcnow()
|
||||
|
||||
config(p_overrides={('ls', 'list_format'): '%z|%I| %x %p %S %k\\t%{(}h{)}'})
|
||||
command = ListCommand(["-x"], self.todolist, self.out, self.error)
|
||||
|
|
Loading…
Reference in a new issue