Code

Bugfix for WEAVE CI#457

Code

Merged

bgunnar5 merged 13 commits intoLLNL:developLLNL/merlin:developfrom bgunnar5:refactor/test-suite-to-pytestbgunnar5/merlin:refactor/test-suite-to-pytestCopy head branch name to clipboardNov 15, 2023

+3-1

Commits

Commits on Oct 24, 2023

• begin work on integration refactor; create fixtures and initial tests

  bgunnar5

  committed
  cb8be3b

  Copy full SHA for cb8be3b

• update CHANGELOG and run fix-style

  bgunnar5

  committed
  c951c81

  Copy full SHA for c951c81

Commits on Nov 1, 2023

• add pytest fixtures and README explaining them

  bgunnar5

  committed
  4ecf7f4

  Copy full SHA for 4ecf7f4

• add tests to demonstrate how to use the fixtures

  bgunnar5

  committed
  c8fea94

  Copy full SHA for c8fea94

• move/rename some files and modify integration's README

  bgunnar5

  committed
  53e8cc3

  Copy full SHA for 53e8cc3

• pull changes from develop

  bgunnar5

  committed
  a216eb3

  Copy full SHA for a216eb3

Commits on Nov 2, 2023

• add password change to redis.pass file

  bgunnar5

  committed
  33b4dc8

  Copy full SHA for 33b4dc8

• fix lint issues

  bgunnar5

  committed
  7a9f13c

  Copy full SHA for 7a9f13c

• modify redis pwd for test server to be constant for each test

  bgunnar5

  committed
  ee6b9dc

  Copy full SHA for ee6b9dc

• fix lint issue only caught on github ci

  bgunnar5

  committed
  e833dce

  Copy full SHA for e833dce

Commits on Nov 7, 2023

• Pull any changes from develop

  bgunnar5

  committed
  8577ae5

  Copy full SHA for 8577ae5

• add fix for merlin server startup

  bgunnar5

  committed
  f6c64f8

  Copy full SHA for f6c64f8

Commits on Nov 15, 2023

• update CHANGELOG

  bgunnar5

  committed
  a9114e9

  Copy full SHA for a9114e9