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

iBridges integration tests #34

Merged
merged 18 commits into from
Feb 8, 2024
Merged

iBridges integration tests #34

merged 18 commits into from
Feb 8, 2024

Conversation

qubixes
Copy link
Collaborator

@qubixes qubixes commented Feb 1, 2024

Almost working, just some problems with the key that becomes uppercase for which I need @chStaiger!

@chStaiger
Copy link
Collaborator

The uppercase Metadata keys com from this line:
https://github.com/UtrechtUniversity/iBridges/blob/dfdfe932529cbacf60d23cc71becec2eb2658542/ibridges/irodsconnector/meta.py#L50

It was once good practice to capitalise keys, however times have changed and I think we can drop that ;)

@qubixes
Copy link
Collaborator Author

qubixes commented Feb 2, 2024

@chStaiger Thanks! I have moved from the python script to using pytest for our integration test. It might be a while for them to be all done. ;)

@chStaiger
Copy link
Collaborator

Let me know if I can be of any help!

@qubixes qubixes force-pushed the ibridges-integration-tests branch from 802781e to e320c14 Compare February 6, 2024 14:01
@qubixes qubixes requested a review from chStaiger February 6, 2024 14:07
@qubixes
Copy link
Collaborator Author

qubixes commented Feb 6, 2024

@chStaiger I think for this PR, this is enough. Expansion of the integration tests can be done in another PR I think.

Copy link
Collaborator

@chStaiger chStaiger left a comment

Choose a reason for hiding this comment

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

This is super useful and thanks for taking the effort converting the original integration tests into pytests! Only some minor changes and cleaning up.

docker/README.md Outdated Show resolved Hide resolved
docker/irods_catalog_provider/setup-4.2.12.input Outdated Show resolved Hide resolved
docker/irods_client/ibridges_config.json Outdated Show resolved Hide resolved
docker/irods_client/integration_test.py Outdated Show resolved Hide resolved
docker/irods_client/testdata/test_utils.py Outdated Show resolved Hide resolved
docker/irods_client/tests/test_data_ops.py Outdated Show resolved Hide resolved

def test_pam_password(session, config, irods_env):
if not config["can_write_pam_pass"]:
pytest.xfail("This iRods server cannot write pam passwords.")
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think this test should also work. It might have something to do with the write-rights in the docker image. I will make a note and take a look. For this PR we cna leave it like this.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I don't think it's a simple write issue though, since I'm also writing quite a few files, without problems. Maybe it's just in the root folder, or the directory is not made?

@chStaiger chStaiger self-requested a review February 7, 2024 19:22
Copy link
Collaborator

@chStaiger chStaiger left a comment

Choose a reason for hiding this comment

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

Approved!!!

from ibridges.utils.path import IrodsPath


def _get_digest(obj_or_file):
Copy link
Collaborator

Choose a reason for hiding this comment

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

Nicely done!!!

@qubixes qubixes merged commit 7104453 into develop Feb 8, 2024
5 checks passed
maartenschermer pushed a commit that referenced this pull request Feb 13, 2024
See the file under docker/README.md on how to run these tests (locally).
maartenschermer pushed a commit that referenced this pull request Feb 14, 2024
See the file under docker/README.md on how to run these tests (locally).
@chStaiger chStaiger deleted the ibridges-integration-tests branch February 27, 2024 08:09
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