Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Simplify import plugin unit tests"

Browse Source 
This works with python 3.6 but not with 3.4.

This reverts commit b43d94ab16555f0bba21e717bf06bfd3f7ee3575.
This commit is contained in:
Nick Hall 2017-07-18 16:57:55 +01:00
parent b43d94ab16
commit 8150403ccb
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gramps/plugins/test/imports_test.py
View File

@ -26,7 +26,7 @@ import os
import sys import sys
import re import re
import locale import locale
from time import strptime from time import localtime, strptime
from unittest.mock import patch from unittest.mock import patch
#import logging #import logging
@ -194,12 +194,20 @@ def make_tst_function(tstfile, file_name):
the test function (a method, to be precise). the test function (a method, to be precise).
""" """
@patch('time.time', side_effect=mock_time) @patch('gramps.plugins.db.dbapi.dbapi.time')
@patch('time.localtime', side_effect=mock_localtime) @patch('gramps.plugins.db.bsddb.write.time')
def tst(self, mock_localtime, mock_time): @patch('gramps.gen.utils.unknown.localtime')
@patch('gramps.gen.utils.unknown.time')
@patch('time.localtime')
def tst(self, mockptime, mocktime, mockltime, mockwtime, mockdtime):
""" This compares the import file with the expected result '.gramps' """ This compares the import file with the expected result '.gramps'
file. file.
""" """
mockptime.side_effect = mock_localtime
mocktime.side_effect = mock_time
mockltime.side_effect = mock_localtime
mockwtime.side_effect = mock_time
mockdtime.side_effect = mock_time
fn1 = os.path.join(TEST_DIR, tstfile) fn1 = os.path.join(TEST_DIR, tstfile)
fn2 = os.path.join(TEST_DIR, (file_name + ".gramps")) fn2 = os.path.join(TEST_DIR, (file_name + ".gramps"))
fres = os.path.join(TEMP_DIR, (file_name + ".difs")) fres = os.path.join(TEMP_DIR, (file_name + ".difs"))