Fix execution of copy file/archive command skips 0xFF bytes by tejksat · Pull Request #501 · docker-java/docker-java

tejksat · 2016-03-11T12:10:29Z

I evaded from writing an integration test and just checked that no bytes from 0 to 255 are missed when using HttpResponseStreamHandler. Added Mockito as a test dependency for easy mocking ChannelHandlerContext.

This change is

…entation of copy file/archive commands

codecov-io · 2016-03-11T12:18:07Z

Current coverage is `23.50%`

Merging #501 into master will increase coverage by +0.58% as of ee71263

@@            master   #501   diff @@
=====================================
  Files          291    291       
  Stmts         6042   6042       
  Branches       527    527       
  Methods          0      0       
=====================================
+ Hit           1385   1420    +35
- Partial         83     85     +2
+ Missed        4574   4537    -37

Review entire Coverage Diff as of ee71263

Powered by Codecov. Updated on successful CI builds.

KostyaSha · 2016-03-11T12:25:05Z

src/test/java/com/github/dockerjava/netty/handler/HttpResponseStreamHandlerTest.java

+        streamHandler.channelRead0(ctx, buffer);
+        streamHandler.channelReadComplete(ctx);
+
+        Assert.assertTrue(IOUtils.contentEquals(callback.getInputStream(), new ByteBufInputStream(buffer)));


please use static import

KostyaSha · 2016-03-11T12:25:57Z

@marcuslinke ?

KostyaSha · 2016-03-11T12:26:41Z

I think real integration test is also required.

KostyaSha · 2016-03-11T12:27:45Z

@tejksat please point "~/.docker-java.properties" (example could be found in resources) to some docker daemon and try implement integration test. Example could be found for any existing *Cmd*Test.

tejksat · 2016-03-11T12:45:23Z

@KostyaSha ok, I'll check it a bit later.

…binary file

tejksat · 2016-03-20T11:13:20Z

@KostyaSha done. Please, take a look.

KostyaSha · 2016-03-20T11:14:44Z

Cool, thanks. Would like @marcuslinke to look at.

KostyaSha · 2016-03-22T21:48:46Z

@marcuslinke ping

marcuslinke · 2016-03-29T06:13:35Z

Finally back in town hopefully I'm able to merge this evening.

marcuslinke · 2016-03-29T18:29:53Z

I will release 3.0.0-RC4 including this fix soon.

marcuslinke · 2016-03-29T18:30:19Z

@tejksat Thanks for contributing!

tejksat · 2016-03-31T11:27:02Z

Nice, thank you!

Fixes skipping 0xff bytes from result stream returned by Netty implem…

3b3399d

…entation of copy file/archive commands

KostyaSha reviewed Mar 11, 2016
View reviewed changes

tejksat added 2 commits March 20, 2016 01:07

Integration test for copy archive cmd checking integrity of received …

c3ab3d2

…binary file

Static import for assertion used, imports reformatted

2f62af8

KostyaSha assigned marcuslinke Mar 20, 2016

KostyaSha added the type/bug label Mar 20, 2016

marcuslinke merged commit 2f62af8 into docker-java:master Mar 29, 2016

KostyaSha added this to the 3.0.0-RC4 milestone Mar 29, 2016

marcuslinke mentioned this pull request Mar 29, 2016

InputStream returned on execution of copy file/archive command skips 0xFF bytes #496

Closed

marcuslinke changed the title ~~Fix for #496~~ Fix execution of copy file/archive command skips 0xFF bytes Mar 29, 2016

tejksat deleted the fixNettyResponseStreamSkipsFFBytes branch March 31, 2016 11:25

Conversation

tejksat commented Mar 11, 2016

Uh oh!

codecov-io commented Mar 11, 2016

Current coverage is 23.50%

Uh oh!

KostyaSha Mar 11, 2016

Choose a reason for hiding this comment

Uh oh!

KostyaSha commented Mar 11, 2016

Uh oh!

KostyaSha commented Mar 11, 2016

Uh oh!

KostyaSha commented Mar 11, 2016

Uh oh!

tejksat commented Mar 11, 2016

Uh oh!

tejksat commented Mar 20, 2016

Uh oh!

KostyaSha commented Mar 20, 2016

Uh oh!

KostyaSha commented Mar 22, 2016

Uh oh!

marcuslinke commented Mar 29, 2016

Uh oh!

marcuslinke commented Mar 29, 2016

Uh oh!

marcuslinke commented Mar 29, 2016

Uh oh!

tejksat commented Mar 31, 2016

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Current coverage is `23.50%`