Fix Syslog mask spec #1900

Merged
merged 2 commits into from Sep 22, 2012

Conversation

Projects
None yet
3 participants
Contributor

lmars commented Sep 13, 2012

The Syslog needs to be re-opened so that @mask_before_reopen (set in
Syslog.reopen) is also reset to the value of 255.

Without this, subsequent calls to Syslog.open will set the mask to
@mask_before_open, which causes other specs (e.g. warning_spec) to fail.

Contributor

lmars commented Sep 14, 2012

In fact, I think it is better to reset @mask_before_reopen when calling Syslog.mask=, see e6d1dc1

Contributor

lmars commented Sep 14, 2012

And here is a test: 482f8f2

Member

carlosgaldino commented Sep 15, 2012

You have two commits with the same message. Could you change the messages?

And also, you changed the code so the first commit you made would be unnecessary. And the squash didn't work. I think it'd be good if you squashed the second commit into the first one and forced a push. wdyt?

Contributor

lmars commented Sep 16, 2012

@carlosgaldino Yes my usual workflow is to push up squash commits then squash them all together just before a merge, which I have now done

Member

carlosgaldino commented Sep 18, 2012

Good. Just another thing, the spec should be in a separate commit. Sorry if I didn't make it clear on my previous comment.

Lewis Marshall added some commits Sep 18, 2012

Reset @mask_before_reopen in Syslog.mask=
Without this, calling Syslog.open after Syslog.mask= will erroneously
reset the mask to the value stored in @mask_before_reopen
Contributor

lmars commented Sep 18, 2012

Ok done. Is that because it needs to be commited to RubySpec?

Contributor

lmars commented Sep 20, 2012

Should I ignore the Travis errors?

brixen pushed a commit that referenced this pull request Sep 22, 2012

@brixen brixen merged commit 1d1f3a4 into rubinius:master Sep 22, 2012

1 check failed

default The Travis build failed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment