Skip to content

Fix appveyor ci for round4#2864

Merged
cosmo0920 merged 4 commits into
masterfrom
fix-appveyor-ci-for-round4
Mar 10, 2020
Merged

Fix appveyor ci for round4#2864
cosmo0920 merged 4 commits into
masterfrom
fix-appveyor-ci-for-round4

Conversation

@cosmo0920

Copy link
Copy Markdown
Contributor

Which issue(s) this PR fixes:

Related to #2854.

  • Fix expected position in posfile
  • Use correct error message on connecting error
  • Sort by tag name instead of timestamps which are same integer value (this causes unstable result)

What this PR does / why we need it:
We should take care of AppVeyor CI result.

Docs Changes:
No needed.

Release Note:

None.

@cosmo0920 cosmo0920 requested a review from ganmacs March 6, 2020 07:30
@cosmo0920 cosmo0920 force-pushed the fix-appveyor-ci-for-round4 branch from c102e55 to 75a631c Compare March 6, 2020 07:33
@cosmo0920

Copy link
Copy Markdown
Contributor Author

Phew, we got green on AppVeyor! https://ci.appveyor.com/project/fluent/fluentd/builds/31285183

@ganmacs ganmacs left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

commit message may have a typo. 75a631c

aortable -> sortable ?

assert_equal 2, lines.size
assert_equal "valid_path\t000000000000000a\t000000000000000b\n", lines[0]
if Fluent.windows?
assert_equal "valid_path\t0000000000000000a\t000000000000000b\n", lines[0]

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

[question] Why it happens?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'll dig it.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Aha! I got it.
In Windows, it is also needed to use binmode for Tempfile! 👊

@cosmo0920 cosmo0920 force-pushed the fix-appveyor-ci-for-round4 branch from 75a631c to 5328234 Compare March 6, 2020 09:49
Signed-off-by: Hiroshi Hatake <hatake@clear-code.com>
Winsock generates the different error message than Linux's.

Signed-off-by: Hiroshi Hatake <hatake@clear-code.com>
Because these test cases should handle same timestamp.
We should sort with another sortable key such as tag.

Signed-off-by: Hiroshi Hatake <hatake@clear-code.com>
In Windows, writing 0 contained contents should be written as binmode.
Otherwise, it will cause corrupted contents.

Signed-off-by: Hiroshi Hatake <hatake@clear-code.com>
@cosmo0920 cosmo0920 force-pushed the fix-appveyor-ci-for-round4 branch from 5328234 to 7560a48 Compare March 9, 2020 10:03
@cosmo0920

Copy link
Copy Markdown
Contributor Author

I'll merge this PR after finishing CIs. 💪

@cosmo0920 cosmo0920 merged commit 66cad23 into master Mar 10, 2020
@cosmo0920 cosmo0920 deleted the fix-appveyor-ci-for-round4 branch March 10, 2020 01:02
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