Skip to content

Disable TestPsListContainersFilterExited (Windows)#39945

Merged
tiborvass merged 1 commit intomoby:masterfrom
vikramhh:disable_TestPsListContainersFilterExited_on_windows
Sep 19, 2019
Merged

Disable TestPsListContainersFilterExited (Windows)#39945
tiborvass merged 1 commit intomoby:masterfrom
vikramhh:disable_TestPsListContainersFilterExited_on_windows

Conversation

@vikramhh
Copy link

@vikramhh vikramhh commented Sep 17, 2019

relates to #20819

TestPsListContainersFilterExited is flaky on both RS1 and RS5.

Disable it for Windows by making it specific to Linux.

This is a workaround - a true fix would at least retry a few times in case
of the specific failure scenario [container not yet exited by the time we check
its exit value].

Signed-off-by: Vikram bir Singh vikrambir.singh@docker.com

- What I did
Disable TestPsListContainersFilterExited on Windows

- How I did it
Added a check that the daemon is a Linux daemon

- How to verify it
Test should not be executed on Windows but continue to be executed on Linux

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@vikramhh
Copy link
Author

@thaJeztah While we are here, I noticed that the "Accept change" button seems to not work. I was pleasantly surprised to see it there and used it. And got an error message that my commit is not signed. Could I have done something to include my signatures there [or better yet could they have been included automatically]?

@vikramhh
Copy link
Author

Not only that but the suggested steps for working around the signing issue did not help either. Not sure which forum to raise those in - I can delete these comments here later if this is not a good place to bring these up but for now I will document it here:

C:\gopath\src\github.com\moby\moby>git commit --amend --signoff
[disable_TestPsListContainersFilterExited_on_windows b6e3392929] Disable TestPsListContainersFilterExited (Windows)
Date: Tue Sep 17 22:10:54 2019 +0000
1 file changed, 4 insertions(+)

C:\gopath\src\github.com\moby\moby>
C:\gopath\src\github.com\moby\moby>git push --force-with-lease origin disable_TestPsListContainersFilterExited_on_windows
remote: Permission to moby/moby.git denied to vikramhh.
fatal: unable to access 'https://github.com/moby/moby.git/': The requested URL returned error: 403

C:\gopath\src\github.com\moby\moby>git push --force-with-lease upstream disable_TestPsListContainersFilterExited_on_windows
To https://github.com/vikramhh/moby.git
! [rejected] disable_TestPsListContainersFilterExited_on_windows -> disable_TestPsListContainersFilterExited_on_windows (stale info)
error: failed to push some refs to 'https://github.com/vikramhh/moby.git'

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

oh, could you squash the commits?

@thaJeztah
Copy link
Member

sorry didn't see your comments; i'll try to write down the steps when I'm back at my computer

On account of being flaky on both RS1 and RS5.

Co-Authored-By: Sebastiaan van Stijn <thaJeztah@users.noreply.github.com>
Signed-off-by: Vikram bir Singh <vikrambir.singh@docker.com>
@thaJeztah thaJeztah force-pushed the disable_TestPsListContainersFilterExited_on_windows branch from 07d1c2c to 7de4e13 Compare September 19, 2019 16:17
@thaJeztah
Copy link
Member

rebased and squashed;

these were the steps I took;

Make sure my remotes are up to date;

git fetch --all

Start an interactive rebase

git rebase -i -s upstream/master

Which opens an editor;

pick b3ba166560 Disable TestPsListContainersFilterExited (Windows)
pick 9ffc8da716 Update integration-cli/docker_cli_ps_test.go

Change the second pick to s (squash)

pick b3ba166560 Disable TestPsListContainersFilterExited (Windows)
s 9ffc8da716 Update integration-cli/docker_cli_ps_test.go

Cleanup the commit message, save, and close your editor

Rebasing (2/2)
[detached HEAD 7de4e13089] Disable TestPsListContainersFilterExited (Windows)
 Author: Vikram bir Singh <vikrambir.singh@docker.com>
 Date: Tue Sep 17 22:10:54 2019 +0000
 1 file changed, 4 insertions(+)
Successfully rebased and updated refs/heads/vikramhh-disable_TestPsListContainersFilterExited_on_windows.

Force push your changes (assuming the remote pointing to your fork is named origin);

git push -f origin

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

LGTM

@thaJeztah
Copy link
Member

ping @tiborvass @cpuguy83 ptal

@vikramhh
Copy link
Author

vikramhh commented Sep 19, 2019

@thaJeztah - thanks for squashing the commit. Any idea why we ended up in this state? My expectation was that if I "accepted" your comments, it will commit with the -s option on its own.

@tiborvass tiborvass merged commit 8f2ae8f into moby:master Sep 19, 2019
@thaJeztah
Copy link
Member

Yeah, the "suggestion" option isn't very useful for that; it will be a separate commit for each suggestion, and won't sign-off, so you'd always have to pull and squash afterwards

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants