NikolajDanger/meow_base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactored correctness dir away from core sub dir into either functionality or core as appropriate

Browse Source
This commit is contained in:
PatchOfScotland
2023-03-31 15:55:16 +02:00
parent 5952b02be4
commit 547d5fefce
35 changed files with 69 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/shared.py
View File

@ -7,7 +7,7 @@ import os
from distutils.dir_util import copy_tree
from meow_base.core.correctness.vars import DEFAULT_JOB_OUTPUT_DIR, \
from meow_base.core.vars import DEFAULT_JOB_OUTPUT_DIR, \
DEFAULT_JOB_QUEUE_DIR
from meow_base.functionality.file_io import make_dir, rmtree
from meow_base.patterns.file_event_pattern import FileEventPattern

3
tests/test_all.sh
View File

@ -11,10 +11,8 @@ skip_long_tests=0
for arg in "$@"
do
echo "Given arg: $arg";
if [[ $arg == -s ]]
then
echo "skippy the kangaroo"
skip_long_tests=1
fi
done
@ -31,7 +29,6 @@ do
&& [[ $entry != ./shared.py ]];
then
SKIP_LONG=$skip_long_tests pytest $entry "-W ignore::DeprecationWarning"
# SKIP_LONG=$skip_long_tests pytest $entry
fi
done

2
tests/test_base.py
View File

@ -8,7 +8,7 @@ from meow_base.core.base_handler import BaseHandler
from meow_base.core.base_monitor import BaseMonitor
from meow_base.core.base_pattern import BasePattern
from meow_base.core.base_recipe import BaseRecipe
from meow_base.core.correctness.vars import SWEEP_STOP, SWEEP_JUMP, SWEEP_START
from meow_base.core.vars import SWEEP_STOP, SWEEP_JUMP, SWEEP_START
from meow_base.patterns.file_event_pattern import FileEventPattern
from shared import setup, teardown

2
tests/test_conductors.py
View File

@ -6,7 +6,7 @@ import unittest
from datetime import datetime
from typing import Dict
from meow_base.core.correctness.vars import JOB_TYPE_PYTHON, SHA256, \
from meow_base.core.vars import JOB_TYPE_PYTHON, SHA256, \
JOB_PARAMETERS, PYTHON_FUNC, JOB_ID, BACKUP_JOB_ERROR_FILE, \
JOB_EVENT, META_FILE, PARAMS_FILE, JOB_STATUS, JOB_ERROR, JOB_TYPE, \
JOB_PATTERN, STATUS_DONE, JOB_TYPE_PAPERMILL, JOB_RECIPE, JOB_RULE, \

2
tests/test_functionality.py
View File

@ -12,7 +12,7 @@ from time import sleep
from typing import Dict
from meow_base.core.rule import Rule
from meow_base.core.correctness.vars import CHAR_LOWERCASE, CHAR_UPPERCASE, \
from meow_base.core.vars import CHAR_LOWERCASE, CHAR_UPPERCASE, \
SHA256, EVENT_TYPE, EVENT_PATH, EVENT_TYPE_WATCHDOG, \
WATCHDOG_BASE, WATCHDOG_HASH, EVENT_RULE, JOB_PARAMETERS, \
PYTHON_FUNC, JOB_ID, JOB_EVENT, \

2
tests/test_patterns.py
View File

@ -6,7 +6,7 @@ import unittest
from multiprocessing import Pipe
from time import sleep
from meow_base.core.correctness.vars import FILE_CREATE_EVENT, EVENT_TYPE, \
from meow_base.core.vars import FILE_CREATE_EVENT, EVENT_TYPE, \
EVENT_RULE, WATCHDOG_BASE, EVENT_TYPE_WATCHDOG, EVENT_PATH, SWEEP_START, \
SWEEP_JUMP, SWEEP_STOP, DIR_EVENTS
from meow_base.functionality.file_io import make_dir

4
tests/test_recipes.py
View File

@ -8,8 +8,8 @@ import unittest
from multiprocessing import Pipe
from typing import Dict
from meow_base.core.correctness.meow import valid_job
from meow_base.core.correctness.vars import EVENT_TYPE, WATCHDOG_BASE, \
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, \
JOB_ID, JOB_TYPE_PYTHON, JOB_PARAMETERS, PYTHON_FUNC, \
JOB_STATUS, META_FILE, JOB_ERROR, PARAMS_FILE, SWEEP_STOP, SWEEP_JUMP, \

10
tests/test_runner.py
View File

@ -13,7 +13,7 @@ from meow_base.core.base_conductor import BaseConductor
from meow_base.core.base_handler import BaseHandler
from meow_base.core.base_monitor import BaseMonitor
from meow_base.conductors import LocalPythonConductor
from meow_base.core.correctness.vars import JOB_TYPE_PAPERMILL, JOB_ERROR, \
from meow_base.core.vars import JOB_TYPE_PAPERMILL, JOB_ERROR, \
META_FILE, JOB_TYPE_PYTHON, JOB_CREATE_TIME, get_result_file
from meow_base.core.runner import MeowRunner
from meow_base.functionality.file_io import make_dir, read_file, \
@ -972,7 +972,7 @@ class MeowTests(unittest.TestCase):
# Test some actual scientific analysis, but in a simple progression
def testScientificAnalysisAllGood(self)->None:
if os.environ["SKIP_LONG"]:
if os.environ["SKIP_LONG"] and os.environ["SKIP_LONG"] == '1':
warn("Skipping testScientificAnalysisAllGood")
return
@ -1096,7 +1096,7 @@ class MeowTests(unittest.TestCase):
# Test some actual scientific analysis, in a predicatable loop
def testScientificAnalysisPredictableLoop(self)->None:
if os.environ["SKIP_LONG"]:
if os.environ["SKIP_LONG"] and os.environ["SKIP_LONG"] == '1':
warn("Skipping testScientificAnalysisPredictableLoop")
return
@ -1235,7 +1235,7 @@ class MeowTests(unittest.TestCase):
# Test some actual scientific analysis, in an unpredicatable loop
def testScientificAnalysisRandomLoop(self)->None:
if os.environ["SKIP_LONG"]:
if os.environ["SKIP_LONG"] and os.environ["SKIP_LONG"] == '1':
warn("Skipping testScientificAnalysisRandomLoop")
return
@ -1387,7 +1387,7 @@ class MeowTests(unittest.TestCase):
# Test some actual scientific analysis, in an unpredicatable loop
def testScientificAnalysisMassiveRandomLoop(self)->None:
if os.environ["SKIP_LONG"]:
if os.environ["SKIP_LONG"] and os.environ["SKIP_LONG"] == '1':
warn("Skipping testScientificAnalysisMassiveRandomLoop")
return

6
tests/test_validation.py
View File

@ -5,13 +5,13 @@ import os
from datetime import datetime
from typing import Any, Union
from meow_base.core.correctness.meow import valid_event, valid_job, \
from meow_base.core.meow import valid_event, valid_job, \
valid_watchdog_event
from meow_base.core.correctness.validation import check_type, \
from meow_base.functionality.validation import check_type, \
check_implementation, valid_string, valid_dict, valid_list, \
valid_existing_file_path, valid_dir_path, valid_non_existing_path, \
check_callable
from meow_base.core.correctness.vars import VALID_NAME_CHARS, SHA256, \
from meow_base.core.vars import VALID_NAME_CHARS, SHA256, \
EVENT_TYPE, EVENT_PATH, JOB_TYPE, JOB_EVENT, JOB_ID, JOB_PATTERN, \
JOB_RECIPE, JOB_RULE, JOB_STATUS, JOB_CREATE_TIME, EVENT_RULE, \
WATCHDOG_BASE, WATCHDOG_HASH