Skip to content

Remove *_solaris.go files#39842

Merged
kolyshkin merged 1 commit intomoby:masterfrom
tklauser:rm-solaris-files
Sep 2, 2019
Merged

Remove *_solaris.go files#39842
kolyshkin merged 1 commit intomoby:masterfrom
tklauser:rm-solaris-files

Conversation

@tklauser
Copy link
Contributor

@tklauser tklauser commented Sep 2, 2019

- What I did

Removed two leftover *_solaris.go files missed in PR #35373.

- How I did it

git rm ./pkg/parsers/kernel/uname_solaris.go ./pkg/system/stat_solaris.go

- How to verify it

find -name *_solaris.* should only yield results in vendor/

- Description for the changelog

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

Pied kingfisher

@tklauser
Remove *_solaris.go files
6751718 
Support for GOOS=solaris was removed in PR moby#35373. Remove two leftover
*_solaris.go files missed in this PR.

Signed-off-by: Tobias Klauser <[email protected]>
thaJeztah
thaJeztah approved these changes Sep 2, 2019
View reviewed changes
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, thanks!

@thaJeztah
Copy link
Member

thaJeztah commented Sep 2, 2019

ping @kolyshkin ptal

@thaJeztah
Copy link
Member

thaJeztah commented Sep 2, 2019

This docker-py test probably should be skipped as "flaky"

[2019-09-02T08:40:15.796Z] =================================== FAILURES ===================================
[2019-09-02T08:40:15.796Z] __________________ AttachContainerTest.test_attach_no_stream ___________________
[2019-09-02T08:40:15.796Z] tests/integration/api_container_test.py:1250: in test_attach_no_stream
[2019-09-02T08:40:15.796Z]     assert output == 'hello\n'.encode(encoding='ascii')
[2019-09-02T08:40:15.796Z] E   AssertionError: assert b'' == b'hello\n'
[2019-09-02T08:40:15.796Z] E     Right contains more items, first extra item: 104
[2019-09-02T08:40:15.796Z] E     Use -v to get the full diff
[2019-09-02T08:40:15.796Z] ------- generated xml file: /src/bundles/test-docker-py/junit-report.xml -------
[2019-09-02T08:40:15.796Z] =========================== short test summary info ============================

@thaJeztah thaJeztah mentioned this pull request Sep 2, 2019
Merged
kolyshkin
kolyshkin approved these changes Sep 2, 2019
View reviewed changes
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM

@kolyshkin kolyshkin merged commit 6f9e294 into moby:master Sep 2, 2019
@tklauser tklauser deleted the rm-solaris-files branch September 3, 2019 13:32
@thaJeztah thaJeztah added this to the 20.03.0 milestone Apr 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@kolyshkin kolyshkin kolyshkin approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

status/4-merge

Projects

None yet

Milestone

20.10.0

Development

Successfully merging this pull request may close these issues.

5 participants

@tklauser @thaJeztah @kolyshkin @AkihiroSuda @GordonTheTurtle