Skip to content
This repository has been archived by the owner on Jul 16, 2020. It is now read-only.

ciao-launcher: Fix unit test deadlocks #469

Merged

Conversation

markdryan
Copy link
Contributor

The code in instance_test.go that waited for the instance loop to close
down was incorrect. There was a possibility of deadlock if the instance
loop was sending some stats down the overseer channel at the same time
as the test was trying to shut down the instance. There is similar code
in the overseer which actually shuts down the instance loop correctly.
This commit simply ports the good overseer code over to instance_test.go.

Partial fix for #434

Signed-off-by: Mark Ryan [email protected]

The code in instance_test.go that waited for the instance loop to close
down was incorrect.  There was a possibility of deadlock if the instance
loop was sending some stats down the overseer channel at the same time
as the test was trying to shut down the instance.  There is similar code
in the overseer which actually shuts down the instance loop correctly.
This commit simply ports the good overseer code over to instance_test.go.

Partial fix for ciao-project#434

Signed-off-by: Mark Ryan <[email protected]>
@coveralls
Copy link

coveralls commented Aug 17, 2016

Coverage Status

Coverage decreased (-0.03%) to 66.019% when pulling b764708 on markdryan:kaccardi/topic/storage into 2abcb88 on 01org:kaccardi/topic/storage.

@coveralls
Copy link

coveralls commented Aug 17, 2016

Coverage Status

Coverage remained the same at 66.044% when pulling 073416b on markdryan:kaccardi/topic/storage into 2abcb88 on 01org:kaccardi/topic/storage.

@markdryan markdryan force-pushed the kaccardi/topic/storage branch from 073416b to b764708 Compare August 17, 2016 16:57
@tpepper tpepper merged commit aa88429 into ciao-project:kaccardi/topic/storage Aug 17, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants