diff --git a/dev/build_and_install.sh b/dev/build_and_install.sh index b378aa6..a983eb7 100644 --- a/dev/build_and_install.sh +++ b/dev/build_and_install.sh @@ -22,8 +22,5 @@ X=$(ls -1tr dist/*.whl |tail -n 1) python3 -m pip install --require-virtualenv --force-reinstall --no-deps $X python3 -m pytest -# Run a demo -test_adctk_builder - # build documentation in doc/generated. Doxygen 1.16.1 or later is highly recommended. doxygen Doxyfile diff --git a/pyproject.toml b/pyproject.toml index b644bc8..da71476 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -36,7 +36,7 @@ dev = [ adctk-publish = "adctk.scripts.adctk_publish:main" adctk_hello_world = "adctk.scripts.adctk_hello_world:main" test_adc_types = "adctk.scripts.test_adc_types:main" -test_adctk_builder = "adctk.scripts.test_adctk_builder:main" +test_adctk_builder = "tests.test_adctk_builder:main" test_old_builder = "adctk.scripts.test_builder:main" ldms-blob-file-to-http-post = "adctk.ldms_scripts.ldms_blob_file_to_http_post:main" diff --git a/src/adctk/scripts/test_adctk_builder.py b/tests/test_adctk_builder.py similarity index 98% rename from src/adctk/scripts/test_adctk_builder.py rename to tests/test_adctk_builder.py index 14dd89f..dcbac68 100644 --- a/src/adctk/scripts/test_adctk_builder.py +++ b/tests/test_adctk_builder.py @@ -5,9 +5,9 @@ import array import numpy import adctk -#import adctk.adc_types -#import adctk.builder -#import adctk.publisher +import adctk.adc_types +import adctk.builder +import adctk.publisher adc_plugin_file_config = { "ADC_FILE_PLUGIN_DIRECTORY": "./test.outputs", @@ -23,7 +23,7 @@ # fixme: use logger # config w/file_config and call initialize. -def test_publisher( pub: adctk.Publisher, b: adctk.Builder) -> int : +def xtest_publisher( pub: adctk.Publisher, b: adctk.Builder) -> int : err = 0 e = 0 err = pub.config(**file_config) @@ -407,18 +407,18 @@ def main() -> int: print("NONE TEST") p0 = f.get_publisher("none") - print(test_publisher(p0, b)) + print(xtest_publisher(p0, b)) print("FILE TEST") p1 = f.get_publisher("file") - print(test_publisher(p1, b)) + print(xtest_publisher(p1, b)) print("STDOUT TEST") p2 = f.get_publisher("stdout") - print(test_publisher(p2, b)) + print(xtest_publisher(p2, b)) # p3 = f.get_publisher("syslog") -# print(test_publisher(p3, b)) +# print(xtest_publisher(p3, b)) print("MULTIPUB TEST") diff --git a/src/adctk/scripts/test_builder.py b/tests/test_basicbuilder.py similarity index 100% rename from src/adctk/scripts/test_builder.py rename to tests/test_basicbuilder.py