Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix split logic tests in dev, bump kernel version #443

Merged
merged 3 commits into from
Feb 10, 2020

Conversation

emkll
Copy link
Contributor

@emkll emkll commented Feb 6, 2020

Status

Ready for review

Description of Changes

Towards #441. Due to the way configure-environment script introduced in #432 only writes the config in /srv/salt and that tests are not shipped as part of staging and prod packages (they need to be checked out in dom0 separately), it seemed acceptable to default to dev values here for tests.

Testing

I think a visual review here is sufficient, as I have already tested the changes locally (make clean, make all, make test, as well as quick client functionality review - download, decrypt, view, export, reply)

  • Defaulting to dev for tests make sense

Optional functional testing

  • All tests pass on this branch (after make clean, make all, make test on this branch)

emkll added 2 commits February 6, 2020 13:51
The configure-environment script invoked by the Makefile dumps the config to /srv/salt/sd/config.json but does not update the config.json in the source folder in developement environments.

Since tests don't currently work against production or starting targets, and are run only in the source repository, let's default to dev values for tests and revisit later.
We're no longer defaulting to prod
Copy link
Contributor

@conorsch conorsch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Confirmed all tests passing on a local build. Appended one commit to clean up some comments that were still referencing the old prod-default.

@conorsch conorsch merged commit 0092c48 into master Feb 10, 2020
@legoktm legoktm deleted the 441-fix-kernel-tests branch May 28, 2024 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants