UIP-49 - separate Integration vs unit tests in test script #98
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Sigh, GitHub didn't update the PR target after merging the previous PR. So the appinfo changes are back again! The actual unreviewed changes are in the latest 3 commits. |
briehl
commented
Jun 11, 2024
| @@ -13,7 +13,8 @@ | |||
| from lib.installed_clients.FakeObjectsForTestsClient import FakeObjectsForTests | |||
| from lib.installed_clients.WorkspaceClient import Workspace | |||
|
|
|||
| @pytest.fixture(scope="session") | |||
|
|
|||
| @pytest.fixture(scope="module") | |||
There was a problem hiding this comment.
Scope this to the module, in case any tests make changes to the config (like the sharemanager tests...)
briehl
commented
Jun 11, 2024
| @@ -2,11 +2,26 @@ | |||
| current_dir=$(dirname "$(readlink -f "$0")") | |||
| script_dir=$(dirname "$(readlink -f "$0")") | |||
| export KB_DEPLOYMENT_CONFIG="$current_dir"/deploy.cfg | |||
| export KB_AUTH_TOKEN=`cat /kb/module/work/token` | |||
| if [ -f /kb/module/work/token ]; then | |||
There was a problem hiding this comment.
This was failing in local unit tests, so I put in a test for that file and a little log message about using it.
briehl
commented
Jun 11, 2024
| @@ -46,23 +47,26 @@ def test_invalid_share_level(config: dict[str, str]): | |||
| @mock.patch("NarrativeService.sharing.sharemanager.feeds") | |||
| @mock.patch("NarrativeService.sharing.sharemanager.ws.get_ws_admins", return_value=FAKE_ADMINS) | |||
| def test_make_notification_ok(mock_ws, mock_post, config: dict[str, str]): # noqa: ARG001 | |||
| config["service-token"] = "fake-service-token" | |||
| config["ws-admin-token"] = "fake-admin-token" | |||
| for key in REQUIRED_TOKEN_KEYS: | |||
There was a problem hiding this comment.
Make sure the keys are set as expected for each test. These modify the config dictionary, which persists throughout the module.
ialarmedalien
approved these changes
Jun 11, 2024
…nged to module scope as well
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The
test/run_tests.shscript now knows the difference between integration and unit tests.If run just plain as
sh test/run_tests.sh, it just runs the unit tests.If run as
sh test/run_tests.sh integrationin includes integration tests.It also includes integration tests if the
SDK_CALLBACK_URLenvironment variable is present, which primarily gets set during akb-sdk testrun. So those should always run the whole suite... which is the point, there.This also moves the remaining test files to the integration directory. They're unchanged, except for relative imports in two cases, and the file names were changed.