Fixed the monkeypatching of time.time()

This commit is contained in:
Veronica K. B. Olsen
2020-09-30 23:43:50 +02:00
parent 1a70a4ec1c
commit 238b3c254e
2 changed files with 12 additions and 12 deletions
+11 -10
View File
@@ -29,7 +29,8 @@ import nw
import logging import logging
import json import json
import os import os
import time
from time import time
from nw.constants import ( from nw.constants import (
nwFiles, nwKeyWords, nwItemType, nwItemClass, nwItemLayout, nwAlert nwFiles, nwKeyWords, nwItemType, nwItemClass, nwItemLayout, nwAlert
@@ -176,7 +177,7 @@ class NWIndex():
if "textCounts" in theData.keys(): if "textCounts" in theData.keys():
self.textCounts = theData["textCounts"] self.textCounts = theData["textCounts"]
nowTime = round(time.time()) nowTime = round(time())
self.timeNovel = nowTime self.timeNovel = nowTime
self.timeNote = nowTime self.timeNote = nowTime
self.timeIndex = nowTime self.timeIndex = nowTime
@@ -304,7 +305,7 @@ class NWIndex():
self.refIndex[tHandle] = {} self.refIndex[tHandle] = {}
self.refIndex[tHandle]["T000000"] = { self.refIndex[tHandle]["T000000"] = {
"tags" : [], "tags" : [],
"updated" : round(time.time()), "updated" : round(time()),
} }
if itemLayout == nwItemLayout.NOTE: if itemLayout == nwItemLayout.NOTE:
self.noteIndex[tHandle] = {} self.noteIndex[tHandle] = {}
@@ -359,7 +360,7 @@ class NWIndex():
self._indexWordCounts(tHandle, isNovel, lastText, nTitle) self._indexWordCounts(tHandle, isNovel, lastText, nTitle)
# Update timestamps for index changes # Update timestamps for index changes
nowTime = round(time.time()) nowTime = round(time())
self.timeIndex = nowTime self.timeIndex = nowTime
if isNovel: if isNovel:
self.timeNovel = nowTime self.timeNovel = nowTime
@@ -394,7 +395,7 @@ class NWIndex():
sTitle = "T%06d" % nLine sTitle = "T%06d" % nLine
self.refIndex[tHandle][sTitle] = { self.refIndex[tHandle][sTitle] = {
"tags" : [], "tags" : [],
"updated" : round(time.time()), "updated" : round(time()),
} }
theData = { theData = {
"level" : hDepth, "level" : hDepth,
@@ -404,7 +405,7 @@ class NWIndex():
"cCount" : 0, "cCount" : 0,
"wCount" : 0, "wCount" : 0,
"pCount" : 0, "pCount" : 0,
"updated" : round(time.time()), "updated" : round(time()),
} }
if hText != "": if hText != "":
@@ -428,14 +429,14 @@ class NWIndex():
self.novelIndex[tHandle][sTitle]["cCount"] = cC self.novelIndex[tHandle][sTitle]["cCount"] = cC
self.novelIndex[tHandle][sTitle]["wCount"] = wC self.novelIndex[tHandle][sTitle]["wCount"] = wC
self.novelIndex[tHandle][sTitle]["pCount"] = pC self.novelIndex[tHandle][sTitle]["pCount"] = pC
self.novelIndex[tHandle][sTitle]["updated"] = round(time.time()) self.novelIndex[tHandle][sTitle]["updated"] = round(time())
else: else:
if tHandle in self.noteIndex: if tHandle in self.noteIndex:
if sTitle in self.noteIndex[tHandle]: if sTitle in self.noteIndex[tHandle]:
self.noteIndex[tHandle][sTitle]["cCount"] = cC self.noteIndex[tHandle][sTitle]["cCount"] = cC
self.noteIndex[tHandle][sTitle]["wCount"] = wC self.noteIndex[tHandle][sTitle]["wCount"] = wC
self.noteIndex[tHandle][sTitle]["pCount"] = pC self.noteIndex[tHandle][sTitle]["pCount"] = pC
self.noteIndex[tHandle][sTitle]["updated"] = round(time.time()) self.noteIndex[tHandle][sTitle]["updated"] = round(time())
return return
def _indexSynopsis(self, tHandle, isNovel, theText, nTitle): def _indexSynopsis(self, tHandle, isNovel, theText, nTitle):
@@ -446,12 +447,12 @@ class NWIndex():
if tHandle in self.novelIndex: if tHandle in self.novelIndex:
if sTitle in self.novelIndex[tHandle]: if sTitle in self.novelIndex[tHandle]:
self.novelIndex[tHandle][sTitle]["synopsis"] = theText self.novelIndex[tHandle][sTitle]["synopsis"] = theText
self.novelIndex[tHandle][sTitle]["updated"] = round(time.time()) self.novelIndex[tHandle][sTitle]["updated"] = round(time())
else: else:
if tHandle in self.noteIndex: if tHandle in self.noteIndex:
if sTitle in self.noteIndex[tHandle]: if sTitle in self.noteIndex[tHandle]:
self.noteIndex[tHandle][sTitle]["synopsis"] = theText self.noteIndex[tHandle][sTitle]["synopsis"] = theText
self.noteIndex[tHandle][sTitle]["updated"] = round(time.time()) self.noteIndex[tHandle][sTitle]["updated"] = round(time())
return return
def _indexNoteRef(self, tHandle, aLine, nLine, nTitle): def _indexNoteRef(self, tHandle, aLine, nLine, nTitle):
+1 -2
View File
@@ -3,7 +3,6 @@
""" """
import pytest import pytest
import time
import os import os
import json import json
@@ -29,7 +28,7 @@ def testIndexBuildCheck(monkeypatch, nwLipsum, nwDummy, nwTempProj, nwRef):
assert theProject.openProject(nwLipsum) assert theProject.openProject(nwLipsum)
theProject.mainConf.debugInfo = True theProject.mainConf.debugInfo = True
monkeypatch.setattr(time, "time", lambda: 123.4) monkeypatch.setattr("nw.core.index.time", lambda: 123.4)
theIndex = NWIndex(theProject, nwDummy) theIndex = NWIndex(theProject, nwDummy)
notIndexable = { notIndexable = {