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.

Sign up for GitHub

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

Jump to bottom

FIX failing "FileMonitor-fileChangeTwice_test" #267

Merged
merged 4 commits into from
May 24, 2017
Merged

FIX failing "FileMonitor-fileChangeTwice_test" #267

merged 4 commits into from
May 24, 2017

Conversation

bcarrez
Copy link
Contributor

@bcarrez bcarrez commented May 12, 2017 •
edited by damienmarchal
Loading

This is an attempt to fix FileMonitor-fileChangeTwice_test, failing on windows on other PRs since merge of PR #258

CHANGELOG:

  • Fix FileMonitor_test about file that was not correctly recreated.

This PR:

  • builds with SUCCESS for all platforms on the CI.
  • does not generate new warnings.
  • does not break existing scenes.
  • does not break API compatibility.
  • has been reviewed and agreed to be transitional.
  • is more than 1 week old (or has fast-merge label).

Reviewers will merge only if all these checks are true.

@damienmarchal damienmarchal added pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: status ready Approved a pull-request, ready to be squashed pr: status to review To notify reviewers to review this pull-request and removed pr: status ready Approved a pull-request, ready to be squashed labels May 12, 2017
@damienmarchal
Copy link
Contributor

damienmarchal commented May 12, 2017 •
edited
Loading

The test is failing, the good news is that this is not related to code regression. Nevertheless I suggest we merge this fix quickly as it looks harmless and remove some noise in our dashboard.

@damienmarchal
Copy link
Contributor

Well it seems there is still problem :)

@damienmarchal damienmarchal added pr: status wip Development in the pull-request is still in progress and removed pr: status to review To notify reviewers to review this pull-request labels May 12, 2017
@damienmarchal
Copy link
Contributor

Is this still a WIP ?

@bcarrez
Copy link
Contributor Author

bcarrez commented May 16, 2017

Yep, still in progress. The bug happens only on Linux, I will work on it today on Ubuntu.

@damienmarchal damienmarchal mentioned this pull request May 16, 2017
Merged
6 tasks
@bcarrez
Copy link
Contributor Author

bcarrez commented May 17, 2017

There was a flaw fixed in the tests, fixing it fixed all tests on Linux and OSx but raised errors on Windows. I switch to Redmond's OS to fix them and hopefully, it will then be ok...

@damienmarchal damienmarchal removed the pr: status wip Development in the pull-request is still in progress label May 22, 2017
@bcarrez
Copy link
Contributor Author

bcarrez commented May 22, 2017

At last, this PR is ready. It fixes all FileMonitor tests on all platforms.

@bcarrez bcarrez added the pr: status to review To notify reviewers to review this pull-request label May 22, 2017
@hugtalbot hugtalbot merged commit bd7be48 into sofa-framework:master May 24, 2017
@guparan guparan added the pr: fix Fix a bug label Jun 29, 2017
@guparan guparan added this to the v17.06 milestone Jun 29, 2017
@damienmarchal damienmarchal deleted the fix_failingtest branch July 5, 2017 21:21
@hugtalbot hugtalbot added pr: status ready Approved a pull-request, ready to be squashed and removed pr: status to review To notify reviewers to review this pull-request labels May 16, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@hugtalbot hugtalbot

Labels
pr: fast merge Minor change that can be merged without waiting for the 7 review days pr: fix Fix a bug pr: status ready Approved a pull-request, ready to be squashed
Projects
None yet
Milestone
v17.06
Development

Successfully merging this pull request may close these issues.
4 participants
@bcarrez @damienmarchal @guparan @hugtalbot