Skip to content

19 stream for follow and logs #21

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

Merged
merged 3 commits into from
Aug 13, 2018
Merged

19 stream for follow and logs #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6b934ae
[#19] Request stream object from docker-modem when 'follow' or 'logs'…
markbirbeck Aug 13, 2018
3b93c4d
Minor tweak to streaming object test in order to get shorter error me…
markbirbeck Aug 13, 2018
4569bab
[#19] Remove 'logs' setting in streaming object test since this now c…
markbirbeck Aug 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/lib/SwaggerModem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,8 @@ class SwaggerModem extends Modem {
* in a URL.
*/

if (options.options._query.stream === 'true') {
options.isStream = true
}
options.isStream = ['follow', 'logs', 'stream']
.some(key => options.options._query[key] === 'true')

/**
* The options are ready to go:
Expand Down
8 changes: 6 additions & 2 deletions test/SwaggerModem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ tap.test('SwaggerModem', async t => {
const id = res.Id
req = builder.ContainerAttach({
id,
logs: true,
stream: false,
stdout: true,
stderr: true
Expand All @@ -49,9 +48,14 @@ tap.test('SwaggerModem', async t => {

/**
* Verify that we didn't get a streaming object:
*
* We could test against an empty string but when the test fails we will
* get the entire streaming object displayed as 'not matching' the empty
* string. Checking the type means that we get a much more compact error
* message!
*/

t.equal(res, '')
t.type(res, 'string')

t.comment('deleting the created container')

Expand Down