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

Version 3.1.0 #283

Merged
merged 3 commits into from
Jan 19, 2022
Merged

Version 3.1.0 #283

merged 3 commits into from
Jan 19, 2022

Conversation

mgautierfr
Copy link
Collaborator

No description provided.

@codecov
Copy link

codecov bot commented Jan 19, 2022

Codecov Report

Merging #283 (4904a96) into master (3a9a989) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master     #283   +/-   ##
=======================================
  Coverage   51.13%   51.13%           
=======================================
  Files          21       21           
  Lines        1936     1936           
  Branches     1145     1146    +1     
=======================================
  Hits          990      990           
- Misses        942      944    +2     
+ Partials        4        2    -2     
Impacted Files Coverage Δ
src/tools.cpp 86.49% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3a9a989...4904a96. Read the comment docs.

@mgautierfr mgautierfr merged commit 09fad0d into master Jan 19, 2022
@mgautierfr mgautierfr deleted the version_3.1.0 branch January 19, 2022 15:03
@@ -254,7 +254,7 @@ TEST(zimcheck, integrity_goodzimfile)
{
const std::string expected_output(
"[INFO] Checking zim file data/zimfiles/good.zim" "\n"
"[INFO] Zimcheck version is 3.0.0" "\n"
"[INFO] Zimcheck version is " VERSION "\n"
"[INFO] Verifying ZIM-archive structure integrity..." "\n"
Copy link
Collaborator

Choose a reason for hiding this comment

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

This change means that we don't care about the version string in the zimcheck output (since we test the contents of the VERSION macro via itself). Consider that the VERSION macro is carelessly redefined (#undefed and then #defined) by a header file included after zim-tools/src/version.h. Then our tests will not detect that.

This comment also applies to an earlier commit 409824a (in #208) but then we at least had a fallback in the form of this kind of checks.

I think we should preserve the version in an explicit textual form in at least one place (and better in three - output of zimcheck -v, version info in plaintext output and version info in JSON output).

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Indeed.
I was more on testing the output itself than the version.
I have created the issue #285 for this.

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