added time to all events. this is a unix timestamp so will need to be converted to something nicer if dispalyed, but hey, its easy to store
This commit is contained in:
@ -4,18 +4,19 @@ import os
|
||||
import unittest
|
||||
|
||||
from multiprocessing import Pipe
|
||||
from time import time
|
||||
|
||||
from meow_base.core.meow import valid_job
|
||||
from meow_base.core.vars import EVENT_TYPE, WATCHDOG_BASE, \
|
||||
EVENT_RULE, EVENT_TYPE_WATCHDOG, EVENT_PATH, SHA256, WATCHDOG_HASH, \
|
||||
from meow_base.core.vars import EVENT_TYPE, EVENT_RULE, EVENT_PATH, SHA256, \
|
||||
JOB_PARAMETERS, JOB_FILE, META_FILE, SWEEP_STOP, SWEEP_JUMP, \
|
||||
SWEEP_START
|
||||
SWEEP_START, EVENT_TIME
|
||||
from meow_base.core.rule import Rule
|
||||
from meow_base.functionality.file_io import read_yaml, write_notebook, \
|
||||
threadsafe_read_status
|
||||
from meow_base.functionality.hashing import get_hash
|
||||
from meow_base.functionality.meow import create_rules, create_rule
|
||||
from meow_base.patterns.file_event_pattern import FileEventPattern
|
||||
from meow_base.patterns.file_event_pattern import FileEventPattern, \
|
||||
WATCHDOG_BASE, WATCHDOG_HASH, EVENT_TYPE_WATCHDOG
|
||||
from meow_base.recipes.bash_recipe import BashRecipe, BashHandler
|
||||
from meow_base.recipes.jupyter_notebook_recipe import JupyterNotebookRecipe, \
|
||||
PapermillHandler, get_recipe_from_notebook
|
||||
@ -163,6 +164,7 @@ class PapermillHandlerTests(unittest.TestCase):
|
||||
EVENT_PATH: os.path.join(TEST_MONITOR_BASE, "A"),
|
||||
WATCHDOG_BASE: TEST_MONITOR_BASE,
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time(),
|
||||
WATCHDOG_HASH: get_hash(
|
||||
os.path.join(TEST_MONITOR_BASE, "A"), SHA256
|
||||
)
|
||||
@ -214,6 +216,7 @@ class PapermillHandlerTests(unittest.TestCase):
|
||||
EVENT_PATH: os.path.join(TEST_MONITOR_BASE, "A"),
|
||||
WATCHDOG_BASE: TEST_MONITOR_BASE,
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time(),
|
||||
WATCHDOG_HASH: get_hash(
|
||||
os.path.join(TEST_MONITOR_BASE, "A"), SHA256
|
||||
)
|
||||
@ -284,6 +287,7 @@ class PapermillHandlerTests(unittest.TestCase):
|
||||
EVENT_PATH: os.path.join(TEST_MONITOR_BASE, "A"),
|
||||
WATCHDOG_BASE: TEST_MONITOR_BASE,
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time(),
|
||||
WATCHDOG_HASH: get_hash(
|
||||
os.path.join(TEST_MONITOR_BASE, "A"), SHA256
|
||||
)
|
||||
@ -348,21 +352,24 @@ class PapermillHandlerTests(unittest.TestCase):
|
||||
status, _ = ph.valid_handle_criteria({
|
||||
EVENT_PATH: "path",
|
||||
EVENT_TYPE: "type",
|
||||
EVENT_RULE: rule
|
||||
EVENT_RULE: rule.name,
|
||||
EVENT_TIME: time()
|
||||
})
|
||||
self.assertFalse(status)
|
||||
|
||||
status, _ = ph.valid_handle_criteria({
|
||||
EVENT_PATH: "path",
|
||||
EVENT_TYPE: EVENT_TYPE_WATCHDOG,
|
||||
EVENT_RULE: "rule"
|
||||
EVENT_RULE: "rule",
|
||||
EVENT_TIME: time()
|
||||
})
|
||||
self.assertFalse(status)
|
||||
|
||||
status, _ = ph.valid_handle_criteria({
|
||||
EVENT_PATH: "path",
|
||||
EVENT_TYPE: EVENT_TYPE_WATCHDOG,
|
||||
EVENT_RULE: rule
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time()
|
||||
})
|
||||
self.assertTrue(status)
|
||||
|
||||
@ -432,6 +439,7 @@ class PapermillHandlerTests(unittest.TestCase):
|
||||
EVENT_PATH: os.path.join(TEST_MONITOR_BASE, "A"),
|
||||
WATCHDOG_BASE: TEST_MONITOR_BASE,
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time(),
|
||||
WATCHDOG_HASH: get_hash(
|
||||
os.path.join(TEST_MONITOR_BASE, "A"), SHA256
|
||||
)
|
||||
@ -577,6 +585,7 @@ class PythonHandlerTests(unittest.TestCase):
|
||||
EVENT_PATH: os.path.join(TEST_MONITOR_BASE, "A"),
|
||||
WATCHDOG_BASE: TEST_MONITOR_BASE,
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time(),
|
||||
WATCHDOG_HASH: get_hash(
|
||||
os.path.join(TEST_MONITOR_BASE, "A"), SHA256
|
||||
)
|
||||
@ -628,6 +637,7 @@ class PythonHandlerTests(unittest.TestCase):
|
||||
EVENT_PATH: os.path.join(TEST_MONITOR_BASE, "A"),
|
||||
WATCHDOG_BASE: TEST_MONITOR_BASE,
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time(),
|
||||
WATCHDOG_HASH: get_hash(
|
||||
os.path.join(TEST_MONITOR_BASE, "A"), SHA256
|
||||
)
|
||||
@ -698,6 +708,7 @@ class PythonHandlerTests(unittest.TestCase):
|
||||
EVENT_PATH: os.path.join(TEST_MONITOR_BASE, "A"),
|
||||
WATCHDOG_BASE: TEST_MONITOR_BASE,
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time(),
|
||||
WATCHDOG_HASH: get_hash(
|
||||
os.path.join(TEST_MONITOR_BASE, "A"), SHA256
|
||||
)
|
||||
@ -763,21 +774,24 @@ class PythonHandlerTests(unittest.TestCase):
|
||||
status, _ = ph.valid_handle_criteria({
|
||||
EVENT_PATH: "path",
|
||||
EVENT_TYPE: "type",
|
||||
EVENT_RULE: rule
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time()
|
||||
})
|
||||
self.assertFalse(status)
|
||||
|
||||
status, _ = ph.valid_handle_criteria({
|
||||
EVENT_PATH: "path",
|
||||
EVENT_TYPE: EVENT_TYPE_WATCHDOG,
|
||||
EVENT_RULE: "rule"
|
||||
EVENT_RULE: "rule",
|
||||
EVENT_TIME: time()
|
||||
})
|
||||
self.assertFalse(status)
|
||||
|
||||
status, s = ph.valid_handle_criteria({
|
||||
EVENT_PATH: "path",
|
||||
EVENT_TYPE: EVENT_TYPE_WATCHDOG,
|
||||
EVENT_RULE: rule
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time()
|
||||
})
|
||||
self.assertTrue(status)
|
||||
|
||||
@ -834,6 +848,7 @@ class PythonHandlerTests(unittest.TestCase):
|
||||
EVENT_PATH: os.path.join(TEST_MONITOR_BASE, "A"),
|
||||
WATCHDOG_BASE: TEST_MONITOR_BASE,
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time(),
|
||||
WATCHDOG_HASH: get_hash(
|
||||
os.path.join(TEST_MONITOR_BASE, "A"), SHA256
|
||||
)
|
||||
@ -979,6 +994,7 @@ class BashHandlerTests(unittest.TestCase):
|
||||
EVENT_PATH: os.path.join(TEST_MONITOR_BASE, "A"),
|
||||
WATCHDOG_BASE: TEST_MONITOR_BASE,
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time(),
|
||||
WATCHDOG_HASH: get_hash(
|
||||
os.path.join(TEST_MONITOR_BASE, "A"), SHA256
|
||||
)
|
||||
@ -1030,6 +1046,7 @@ class BashHandlerTests(unittest.TestCase):
|
||||
EVENT_PATH: os.path.join(TEST_MONITOR_BASE, "A"),
|
||||
WATCHDOG_BASE: TEST_MONITOR_BASE,
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time(),
|
||||
WATCHDOG_HASH: get_hash(
|
||||
os.path.join(TEST_MONITOR_BASE, "A"), SHA256
|
||||
)
|
||||
@ -1100,6 +1117,7 @@ class BashHandlerTests(unittest.TestCase):
|
||||
EVENT_PATH: os.path.join(TEST_MONITOR_BASE, "A"),
|
||||
WATCHDOG_BASE: TEST_MONITOR_BASE,
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time(),
|
||||
WATCHDOG_HASH: get_hash(
|
||||
os.path.join(TEST_MONITOR_BASE, "A"), SHA256
|
||||
)
|
||||
@ -1176,6 +1194,7 @@ class BashHandlerTests(unittest.TestCase):
|
||||
EVENT_PATH: os.path.join(TEST_MONITOR_BASE, "A"),
|
||||
WATCHDOG_BASE: TEST_MONITOR_BASE,
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time(),
|
||||
WATCHDOG_HASH: get_hash(
|
||||
os.path.join(TEST_MONITOR_BASE, "A"), SHA256
|
||||
)
|
||||
@ -1221,21 +1240,24 @@ class BashHandlerTests(unittest.TestCase):
|
||||
status, _ = ph.valid_handle_criteria({
|
||||
EVENT_PATH: "path",
|
||||
EVENT_TYPE: "type",
|
||||
EVENT_RULE: rule
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time()
|
||||
})
|
||||
self.assertFalse(status)
|
||||
|
||||
status, _ = ph.valid_handle_criteria({
|
||||
EVENT_PATH: "path",
|
||||
EVENT_TYPE: EVENT_TYPE_WATCHDOG,
|
||||
EVENT_RULE: "rule"
|
||||
EVENT_RULE: "rule",
|
||||
EVENT_TIME: time()
|
||||
})
|
||||
self.assertFalse(status)
|
||||
|
||||
status, s = ph.valid_handle_criteria({
|
||||
EVENT_PATH: "path",
|
||||
EVENT_TYPE: EVENT_TYPE_WATCHDOG,
|
||||
EVENT_RULE: rule
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time()
|
||||
})
|
||||
self.assertTrue(status)
|
||||
|
||||
@ -1292,6 +1314,7 @@ class BashHandlerTests(unittest.TestCase):
|
||||
EVENT_PATH: os.path.join(TEST_MONITOR_BASE, "A"),
|
||||
WATCHDOG_BASE: TEST_MONITOR_BASE,
|
||||
EVENT_RULE: rule,
|
||||
EVENT_TIME: time(),
|
||||
WATCHDOG_HASH: get_hash(
|
||||
os.path.join(TEST_MONITOR_BASE, "A"), SHA256
|
||||
)
|
||||
|
Reference in New Issue
Block a user