Merge pull request #4555 from kbh2o/abort_abort

Return exit code when exiting with --abort-on-container-exit
This commit is contained in:
Joffrey F 2017-03-01 17:51:58 -08:00 committed by GitHub
commit b4f4ff1a6b
6 changed files with 47 additions and 15 deletions

View file

@ -187,11 +187,13 @@ class TestConsumeQueue(object):
assert next(generator) == 'b'
def test_item_is_stop_with_cascade_stop(self):
"""Return the name of the container that caused the cascade_stop"""
queue = Queue()
for item in QueueItem.stop(), QueueItem.new('a'), QueueItem.new('b'):
for item in QueueItem.stop('foobar-1'), QueueItem.new('a'), QueueItem.new('b'):
queue.put(item)
assert list(consume_queue(queue, True)) == []
generator = consume_queue(queue, True)
assert next(generator) is 'foobar-1'
def test_item_is_none_when_timeout_is_hit(self):
queue = Queue()