Code

Refactor/distributed tests#16

Code

Open

bgunnar5 wants to merge 219 commits intodevelopbgunnar5/merlin:developfrom refactor/distributed-testsbgunnar5/merlin:refactor/distributed-testsCopy head branch name to clipboard

+3,199-660

Commits

Commits on Aug 4, 2023

• Merge branch 'develop' of https://github.com/LLNL/merlin into develop

  Show description for ec13acf
  bgunnar5

  committed
  ec13acf

Commits on Nov 20, 2023

• merge latest changes from develop

  bgunnar5

  committed
  7c59fc2

• remove a merge conflict statement that was missed

  bgunnar5

  committed
  29573d4

Commits on Dec 11, 2023

• add pytest coverage library and add sample_index coverage

  bgunnar5

  committed
  f10c896

Commits on Dec 12, 2023

• run fix style and add module header

  bgunnar5

  committed
  362478e

• add tests for encryption modules

  bgunnar5

  committed
  9339b6b

• add unit tests for util_sampling

  bgunnar5

  committed
  54a31bc

• run fix-style and fix typo

  bgunnar5

  committed
  be02611

• pull latest changes from develop

  bgunnar5

  committed
  a015e3c

• create directory for context managers and fix issue with an encryption test

  bgunnar5

  committed
  63d22f0

Commits on Dec 13, 2023

• add a context manager for spinning up/down the redis server

  bgunnar5

  committed
  b2a9976

• Merge remote-tracking branch 'origin/develop' into develop

  bgunnar5

  committed
  0ef09bc

• fix issue with path in one test

  bgunnar5

  committed
  35c614a

• rework CONFIG functionality for testing

  bgunnar5

  committed
  638a27e

Commits on Dec 14, 2023

• refactor config fixture so it doesn't depend on redis server to be started

  bgunnar5

  committed
  9b342ab

• split CONFIG fixtures into rabbit and redis configs, run fix-style

  bgunnar5

  committed
  661ab71

• add unit tests for broker.py

  bgunnar5

  committed
  db1f20a

• add unit tests for the Config object

  bgunnar5

  committed
  896898e

• update CHANGELOG

  bgunnar5

  committed
  2a5148c

Commits on Dec 18, 2023

• make CONFIG fixtures more flexible for tests

  bgunnar5

  committed
  3d7228e

• add tests for results_backend.py

  bgunnar5

  committed
  525e403

• fix lint issues for most recent changes

  bgunnar5

  committed
  47a0b4e

Commits on Dec 19, 2023

• fix filename issue in setup.cfg and move celeryadapter tests to integration suite

  bgunnar5

  committed
  91a3f2f

• add ssl filepaths to mysql config object

  bgunnar5

  committed
  78b019b

• add unit tests for configfile.py

  bgunnar5

  committed
  275fbd4

• add tests for the utils.py file in config/

  bgunnar5

  committed
  9669bd0

• create utilities file and constants file

  bgunnar5

  committed
  2a209e5

Commits on Dec 20, 2023

• move create_dir function to utils.py

  bgunnar5

  committed
  ddb0588

• add tests for merlin/examples/generator.py

  bgunnar5

  committed
  e5bc0fe

• run fix-style and update changelog

  bgunnar5

  committed
  681bd71

Commits on Jan 24, 2024

• Merge remote-tracking branch 'upstream-main/develop' into develop

  bgunnar5

  committed
  fb6058c

Commits on Jan 25, 2024

• Merge remote-tracking branch 'upstream-main/develop' into develop

  bgunnar5

  committed
  2a6ec3a

Commits on Feb 14, 2024

• Merge remote-tracking branch 'upstream-main/develop' into develop

  bgunnar5

  committed
  b22e3a1

• add a 'pip freeze' call in github workflow to view reqs versions

  bgunnar5

  committed
  4b8fab5

Commits on Feb 15, 2024

• Merge remote-tracking branch 'upstream-main/develop' into develop

  bgunnar5

  committed
  714dafe

Commits on Mar 12, 2024

• Merge remote-tracking branch 'upstream-main/develop' into develop

  bgunnar5

  committed
  d00aff0

Commits on Apr 15, 2024

• Merge remote-tracking branch 'upstream-main/develop' into develop

  bgunnar5

  committed
  9a9f2c0

• Merge remote-tracking branch 'upstream-main/develop' into develop

  bgunnar5

  committed
  074e031

Commits on Apr 25, 2024

• pull changes from 1.12.0 and 1.12.1

  bgunnar5

  committed
  124e40f

• re-delete the old config test files

  bgunnar5

  committed
  3099d4c

• fix tests/bugs introduced by merging in develop

  bgunnar5

  committed
  37839f6

• add a unit test file for the dumper module

  bgunnar5

  committed
  b8185cc

Commits on May 7, 2024

• begin work on server tests and modular fixtures

  bgunnar5

  committed
  e48fe32

Commits on May 10, 2024

• pull changes from develop

  bgunnar5

  committed
  812459f

Commits on May 23, 2024

• start work on tests for RedisConfig

  bgunnar5

  committed
  e1f667d

Commits on Jun 4, 2024

• add tests for RedisConfig object

  bgunnar5

  committed
  9997d8e

• add tests for RedisUsers class

  bgunnar5

  committed
  52213f2

Commits on Jun 6, 2024

• change server fixtures to use redis config files

  bgunnar5

  committed
  a59243f

• add tests for AppYaml class

  bgunnar5

  committed
  0ef586e

• final cleanup of server_utils

  bgunnar5

  committed
  bde9079

• fix lint issues

  bgunnar5

  committed
  da94020

• parametrize setup examples tests

  bgunnar5

  committed
  2997de6

• sort example output

  bgunnar5

  committed
  2f24577

• ensure directory is changed back on no outdir test

  bgunnar5

  committed
  5e0a5f7

• sort the specs in examples output

  bgunnar5

  committed
  d8fa77c

• fix lint issues

  bgunnar5

  committed
  8421d74

Commits on Jun 10, 2024

• start writing tests for server config

  bgunnar5

  committed
  0543ae4

Commits on Jun 26, 2024

• add pytest coverage library and add sample_index coverage

  bgunnar5

  committed
  3b0ccde

• run fix style and add module header

  bgunnar5

  committed
  4ad3729

• add tests for encryption modules

  bgunnar5

  committed
  089e2bd

• add unit tests for util_sampling

  bgunnar5

  committed
  2a3bc69

• run fix-style and fix typo

  bgunnar5

  committed
  30fd21d

• create directory for context managers and fix issue with an encryption test

  bgunnar5

  committed
  76b3a55

• add a context manager for spinning up/down the redis server

  bgunnar5

  committed
  fa33cb2

• fix issue with path in one test

  bgunnar5

  committed
  78a298a

• rework CONFIG functionality for testing

  bgunnar5

  committed
  5b6878c

• refactor config fixture so it doesn't depend on redis server to be started

  bgunnar5

  committed
  7aaa832

• split CONFIG fixtures into rabbit and redis configs, run fix-style

  bgunnar5

  committed
  acb6d43

• add unit tests for broker.py

  bgunnar5

  committed
  c1bfc6a

• add unit tests for the Config object

  bgunnar5

  committed
  3300291

• update CHANGELOG

  bgunnar5

  committed
  58a3044

• make CONFIG fixtures more flexible for tests

  bgunnar5

  committed
  9f16701

• add tests for results_backend.py

  bgunnar5

  committed
  17be237

• fix lint issues for most recent changes

  bgunnar5

  committed
  d54f750

• fix filename issue in setup.cfg and move celeryadapter tests to integration suite

  bgunnar5

  committed
  8e9d1e2

• add ssl filepaths to mysql config object

  bgunnar5

  committed
  6dae836

• add unit tests for configfile.py

  bgunnar5

  committed
  89caa21

• add tests for the utils.py file in config/

  bgunnar5

  committed
  ed3a660

• create utilities file and constants file

  bgunnar5

  committed
  45dfa51

• move create_dir function to utils.py

  bgunnar5

  committed
  598ffb7

• add tests for merlin/examples/generator.py

  bgunnar5

  committed
  a8d0d1d

• run fix-style and update changelog

  bgunnar5

  committed
  7728893

• fix tests/bugs introduced by merging in develop

  bgunnar5

  committed
  6b97b0a

• add a unit test file for the dumper module

  bgunnar5

  committed
  57f0446

• begin work on server tests and modular fixtures

  bgunnar5

  committed
  963fed1

• start work on tests for RedisConfig

  bgunnar5

  committed
  8649ca1

• add tests for RedisConfig object

  bgunnar5

  committed
  91ad49b

• add tests for RedisUsers class

  bgunnar5

  committed
  1df0e44

• change server fixtures to use redis config files

  bgunnar5

  committed
  921c38b

• add tests for AppYaml class

  bgunnar5

  committed
  2cad8cb

• final cleanup of server_utils

  bgunnar5

  committed
  f28cad3

• fix lint issues

  bgunnar5

  committed
  716dc32

• parametrize setup examples tests

  bgunnar5

  committed
  c1b71f0

• sort example output

  bgunnar5

  committed
  bd598f4

• ensure directory is changed back on no outdir test

  bgunnar5

  committed
  0487a9e

• sort the specs in examples output

  bgunnar5

  committed
  c11e82f

• fix lint issues

  bgunnar5

  committed
  a39e65c

• start writing tests for server config

  bgunnar5

  committed
  031fb0e

• bake in LC_ALL env variable setting for server cmds

  bgunnar5

  committed
  ed3b4ea

• add tests for parse_redis_output

  bgunnar5

  committed
  9dc2bd8

• fix issue with scope of fixture after rebase

  bgunnar5

  committed
  459aa21

• resolve merge conflicts after rebase

  bgunnar5

  committed
  a6b52d0

• run fix-style

  bgunnar5

  committed
  5945c36

Commits on Jul 23, 2024

• Include celerymanager and update celeryadapter to check the status of celery workers.

  ryannova

  committed
  78ef619

• Fixed issue where the update status was outside of if statement for checking workers

  ryannova

  committed
  8561a18

Commits on Aug 1, 2024

• Include worker status stop and add template for merlin restart

  ryannova

  committed
  1120dd7

Commits on Aug 2, 2024

• Added comment to the CeleryManager init

  ryannova

  committed
  f41938f

• Increment db_num instead of being fixed

  ryannova

  committed
  690115e

• Added other subprocess parameters and created a linking system for redis to store env dict

  ryannova

  committed
  de4ffd0

Commits on Aug 6, 2024

• Implemented stopping of celery workers and restarting workers properly

  ryannova

  committed
  67e9268

• Update stopped to stalled for when the worker doesn't respond to restart

  ryannova

  committed
  406e4c2

Commits on Aug 7, 2024

• Working merlin manager run but start and stop not working properly

  ryannova

  committed
  78e4525

• Made fix for subprocess to start new shell and fixed manager start and stop

  ryannova

  committed
  eca74ac

• Added comments and update changelog

  ryannova

  committed
  ec8aa78

• Include style fixes

  ryannova

  committed
  3f04d24

• Fix style for black

  ryannova

  committed
  5538f4b

• Revert launch_job script that was edited when doing automated lint

  ryannova

  committed
  b6bcd33

• Move importing of CONFIG to be within redis_connection due to error of config not being created yet

  ryannova

  committed
  9b97f8b

• Added space to fix style

  ryannova

  committed
  c9dfd31

• Revert launch_jobs.py:

  ryannova

  committed
  a9bd865

• Update import of all merlin.config to be in the function

  ryannova

  committed
  ddc7614

Commits on Aug 17, 2024

• suggested changes plus beginning work on monitor/manager collab

  bgunnar5

  committed
  353a66b

Commits on Aug 22, 2024

• move managers to their own folder and fix ssl problems

  bgunnar5

  committed
  1a4d416

Commits on Sep 3, 2024

• final PR touch ups

  bgunnar5

  committed
  875f137

• Merge pull request #2 from bgunnar5/monitor_manager_collab

  Show description for 9020aa0
  ryannova

  authored
  9020aa0

• Fix lint style changes

  ryannova

  committed
  58da9bc

Commits on Sep 4, 2024

• Fixed issue with context manager

  ryannova

  committed
  e75dcc2

• Reset file that was incorrect changed

  ryannova

  committed
  11f9e7c

• Check for ssl cert before applying to Redis connection

  ryannova

  committed
  7204e46

• Comment out Active tests for celerymanager

  ryannova

  committed
  53d8f32

Commits on Sep 5, 2024

• split up create_server_config and write tests for it

  bgunnar5

  committed
  6bf1fe6

• add tests for config_merlin_server function

  bgunnar5

  committed
  cf307bb

Commits on Sep 9, 2024

• Fix lint issue with unused import after commenting out Active celery tests

  ryannova

  committed
  a5ccb2d

• Fixed style for import

  ryannova

  committed
  2b0e8a6

• add tests for pull_server_config

  bgunnar5

  committed
  6ba91a6

Commits on Sep 10, 2024

• add tests for pull_server_image

  bgunnar5

  committed
  28e5040

Commits on Sep 11, 2024

• finish writing tests for server_config.py

  bgunnar5

  committed
  24470e5

Commits on Sep 12, 2024

• Fixed kwargs being modified when making a copy for saving to redis worker args.

  ryannova

  committed
  e49f378

Commits on Sep 13, 2024

• add tests for server_commands.py

  bgunnar5

  committed
  72398e6

• run fix-style

  bgunnar5

  committed
  ff4f649

• update README for testing directory

  bgunnar5

  committed
  7050822

• update the temp_output_directory to include python version

  bgunnar5

  committed
  0c74021

• mock the open.write to try to fix github CI

  bgunnar5

  committed
  42c121b

• ensure config dir is created

  bgunnar5

  committed
  f5e8671

• update CHANGELOG

  bgunnar5

  committed
  3ce140e

• add print of exception to OSError catch in pull_server_image

  bgunnar5

  committed
  73e4cf5

• change name of config_file in test that's failing

  bgunnar5

  committed
  5b36b41

• Added password check and omit if a password doesn't exist

  ryannova

  committed
  352e7df

• update CHANGELOG

  bgunnar5

  committed
  9782d58

Commits on Sep 16, 2024

• change testing log level to debug

  bgunnar5

  committed
  75a9972

Commits on Sep 17, 2024

• add debug statement for redis_connection

  bgunnar5

  committed
  c27a208

• change debug log to info so github ci will display it

  bgunnar5

  committed
  97a9cf1

• attempt to fix password missing from Namespace error

  bgunnar5

  committed
  ce8bf37

• run checks for all necessary configurations

  bgunnar5

  committed
  5851d9d

Commits on Sep 20, 2024

• convert stop-workers tests to pytest format

  bgunnar5

  committed
  97d075e

• update github wf and comment out stop-workers tests in definitions.py

  bgunnar5

  committed
  04e9122

• add missing key to GH wf file

  bgunnar5

  committed
  f93c7f6

• fix invalid syntax in definitions.py

  bgunnar5

  committed
  835399c

Commits on Sep 24, 2024

• comment out stop_workers tests

  bgunnar5

  committed
  176ff4d

• playing with new caches for workflow CI

  bgunnar5

  committed
  e38cc93

• fix yaml syntax error

  bgunnar5

  committed
  c136058

• fix typo for getting runner os

  bgunnar5

  committed
  56a6a05

• fix test and add python version to CI cache

  bgunnar5

  committed
  f45a798

• add in common-setup step again with caches this time

  bgunnar5

  committed
  290d350

• run fix-style

  bgunnar5

  committed
  8a1bc14

• update CHANGELOG

  bgunnar5

  committed
  58622ba

• fix remaining style issues

  bgunnar5

  committed
  917f8d7

• run without caches to compare execution time of test suite

  bgunnar5

  committed
  91c7505

• resolve merge conflict

  bgunnar5

  committed
  c7adb96

Commits on Sep 25, 2024

• allow redis config to not use ssl

  bgunnar5

  committed
  608e00e

Commits on Sep 26, 2024

• remove stop-workers and query-workers tests from definitions.py

  bgunnar5

  committed
  bf41a2d

• create helper_funcs file with common testing functions

  bgunnar5

  committed
  630c9c9

• move query-workers to pytest and add base class w/ stop-workers tests

  bgunnar5

  committed
  17889fd

• update CHANGELOG

  bgunnar5

  committed
  5c28b49

Commits on Sep 27, 2024

• final changes for the stop-workers & query-workers tests

  bgunnar5

  committed
  643b4d1

• run fix-style

  bgunnar5

  committed
  0f0264c

Commits on Sep 30, 2024

• move stop and query workers tests to the same file

  bgunnar5

  committed
  6340604

• run fix-style

  bgunnar5

  committed
  19c4bf7

• go back to original cache setup

  bgunnar5

  committed
  99257d8

• try new cache for singularity install

  bgunnar5

  committed
  f947eae

• fix syntax issue in github workflow

  bgunnar5

  committed
  beafb22

• attempt to fix singularity cache

  bgunnar5

  committed
  fac2892

• remove ls statement that breaks workflow

  bgunnar5

  committed
  c49660a

• revert back to no common setup

  bgunnar5

  committed
  ecb1762

• remove unnecessary dependency

  bgunnar5

  committed
  39d09d6

• update github actions versions to use latest

  bgunnar5

  committed
  5f4673b

• update action versions that didn't save

  bgunnar5

  committed
  70e540f

• merge in new tests for stop and query workers commands

  bgunnar5

  committed
  94f8f72

• run fix-style

  bgunnar5

  committed
  d2e85ec

Commits on Oct 3, 2024

• move distributed test suite actions back to v2

  bgunnar5

  committed
  9c4fca4

Commits on Oct 15, 2024

• add 'merlin run' tests and port existing ones to pytest

  bgunnar5

  committed
  3a2cafa

• update CHANGELOG

  bgunnar5

  committed
  15d6665

• add aliased fixture types for typehinting

  bgunnar5

  committed
  5844e91

Commits on Oct 16, 2024

• add tests for the purge command

  bgunnar5

  committed
  085d4b2

• update CHANGELOG

  bgunnar5

  committed
  b36dedc

• update run command tests to use conditions when appropriate

  bgunnar5

  committed
  6758282

Commits on Oct 28, 2024

• start work on adding workflow tests

  bgunnar5

  committed
  466c276

Commits on Oct 31, 2024

• create function and class scoped config fixtures

  bgunnar5

  committed
  144246f

• add Tuple fixture type

  bgunnar5

  committed
  0518a48

• get e2e test of feature_demo workflow running

  bgunnar5

  committed
  d577653

• add check for proper variable substitution in e2e test

  bgunnar5

  committed
  983215b

Commits on Nov 4, 2024

• generalize functionality to run workflows

  bgunnar5

  committed
  977e91c

Commits on Nov 5, 2024

• add create_testing_dir fixture

  bgunnar5

  committed
  ba3f066

• port chord error workflow to pytest

  bgunnar5

  committed
  b30d796

Commits on Nov 8, 2024

• create dataclasses to house common fixtures and reduce fixture import requirements

  bgunnar5

  committed
  8b76db8

• fix lint issues

  bgunnar5

  committed
  c1b39e4

• remove hard requirement of Annotated type for python 3.7 and 3.8

  bgunnar5

  committed
  c450cbd

• remove distributed test CI and add unit test CI

  bgunnar5

  committed
  6a9ede4

• fix typo in fixture_types and fix lint issues

  bgunnar5

  committed
  711ce06

• run fix-style

  bgunnar5

  committed
  088ecc1

• add check for python2 before adding that condition check

  bgunnar5

  committed
  f544644

• convert local run test to use StepFinishedFilesCount condition

  bgunnar5

  committed
  28cae91

• update CHANGELOG.md

  bgunnar5

  committed
  916b5f8

• pull changes from develop

  bgunnar5

  committed
  e108fa9

• fix problem created by merge conflict when mergin develop

  bgunnar5

  committed
  3bc1fa6

Commits on Nov 12, 2024

• remove manager functionality from this PR

  bgunnar5

  committed
  3be8963

• update README for test suite

  bgunnar5

  committed
  29b39d3

• change SIGTERM to SIGKILL

  bgunnar5

  committed
  6dab66b

• update Makefile to include new changes to test suite

  bgunnar5

  committed
  dcefd22