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 bisq.properties pickup in ApiTest #6724

Merged

Conversation

alyokaz
Copy link
Contributor

@alyokaz alyokaz commented Jun 6, 2023

This change copies the 'bisq.properties' file in apitest/src/main/resources to each instance's DataDir on test harness startup.

This was necessary as #5718 was not copying the file into the instance's data dir but leaving it in 'build/resources/main' where it wasn't picked up by the instance.

@alyokaz alyokaz force-pushed the fix-bisq-properties-pickup branch from 88efeff to 5b0c5d5 Compare June 6, 2023 20:32
Copy link
Contributor

@alvasw alvasw left a comment

Choose a reason for hiding this comment

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

Do we need to delete the bisq.properties file in the root directory? The deletion breaks the Gradle Build Cache. It's smarter to include/exclude the file explicitly [1], or even have them multiple times (for all instances) in the resources directory.

I know that you didn't write the initial file-deletion code.

[1] https://docs.gradle.org/current/dsl/org.gradle.language.jvm.tasks.ProcessResources.html

apitest/src/main/java/bisq/apitest/Scaffold.java Outdated Show resolved Hide resolved
@alyokaz alyokaz force-pushed the fix-bisq-properties-pickup branch 2 times, most recently from b73a03e to 2d65ca3 Compare June 22, 2023 23:59
@alyokaz alyokaz requested a review from alvasw June 23, 2023 00:31
Copy link
Contributor

@alvasw alvasw left a comment

Choose a reason for hiding this comment

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

Looks good!

apitest/src/main/java/bisq/apitest/Scaffold.java Outdated Show resolved Hide resolved
Copy 'bisq.properties' file in apitest/src/main/resources
to each instance's DataDir on startup to allow pickup by
the instance.
Remove redundant directory moving and renaming. Make buildResourcesDir
property less brittle.
Stop the deletion of the original bisq.properties file after it's copied into the
instances data directories.
@alyokaz alyokaz force-pushed the fix-bisq-properties-pickup branch from 2d65ca3 to 1a931b8 Compare July 4, 2023 17:43
@alyokaz alyokaz requested a review from alvasw July 4, 2023 18:08
Copy link
Contributor

@alvasw alvasw left a comment

Choose a reason for hiding this comment

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

utACK

Copy link
Contributor

@alejandrogarcia83 alejandrogarcia83 left a comment

Choose a reason for hiding this comment

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

utACK

@alejandrogarcia83 alejandrogarcia83 merged commit 18e789a into bisq-network:master Jul 6, 2023
13 checks passed
@boring-cyborg
Copy link

boring-cyborg bot commented Jul 6, 2023

Awesome work, congrats on your first merged pull request!

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.

3 participants