Skip to content

v2: restore VerifyGroupPath; v2: fix TestParseCgroupFromReader#110

Merged
crosbymichael merged 4 commits intocontainerd:masterfrom
AkihiroSuda:v2-verifypath
Nov 7, 2019
Merged

v2: restore VerifyGroupPath; v2: fix TestParseCgroupFromReader#110
crosbymichael merged 4 commits intocontainerd:masterfrom
AkihiroSuda:v2-verifypath

Conversation

@AkihiroSuda
Copy link
Member

restore VerifyGroupPath removed in #109 (comment)

Also fixes failing test

    --- FAIL: TestParseCgroupFromReader (0.00s)
        utils_test.go:34: expected
    "/user.slice/user-1001.slice/session-1.scope", got ""
        utils_test.go:37: invalid cgroup entry: "2:cpuset:/foo"

containerd#109 (comment)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
  --- FAIL: TestParseCgroupFromReader (0.00s)
      utils_test.go:34: expected
  "/user.slice/user-1001.slice/session-1.scope", got ""
      utils_test.go:37: invalid cgroup entry: "2:cpuset:/foo"

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@codecov-io
Copy link

codecov-io commented Nov 7, 2019

Codecov Report

Merging #110 into master will decrease coverage by 6.46%.
The diff coverage is 68.75%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #110      +/-   ##
==========================================
- Coverage   45.42%   38.95%   -6.47%     
==========================================
  Files          23       31       +8     
  Lines        1638     1961     +323     
==========================================
+ Hits          744      764      +20     
- Misses        768     1069     +301     
- Partials      126      128       +2
Impacted Files Coverage Δ
v2/manager.go 0% <0%> (ø)
v2/paths.go 50% <100%> (ø)
v2/utils.go 16% <75%> (ø)
v2/state.go 0% <0%> (ø)
v2/memory.go 0% <0%> (ø)
v2/errors.go 0% <0%> (ø)
v2/cpu.go 0% <0%> (ø)
... and 1 more

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 82928e8...a4f92d6. Read the comment docs.

Copy link
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@crosbymichael
Copy link
Member

LGTM

@crosbymichael crosbymichael merged commit a026e7e into containerd:master Nov 7, 2019
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.

5 participants