Skip to content
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.

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

Fix JsonProfilePrinter #2187

Merged
merged 3 commits into from Nov 9, 2015
Merged

Fix JsonProfilePrinter #2187

merged 3 commits into from Nov 9, 2015

Conversation

dmarcotte
Copy link
Contributor

@dmarcotte dmarcotte commented Nov 12, 2014

first flag was incorrectly set, resulting in a leading comma for json profile output.

Also remove some calls to rspec's have, which has been removed from rspec since the profiler specs were last run.

@headius, with this the spec/profiler specs are green for 1.7. Do you want to re-enable on Travis?

@headius
Copy link
Member

headius commented Nov 12, 2014

Great to hear you got them all working! Yes, we will reenable on travis. Add that to PR and we'll pull it in.

@dmarcotte
Copy link
Contributor Author

dmarcotte commented Nov 13, 2014

Ready to go! Specs are enabled and verified (also fixed a problem where it was messing with rake's final outcome in spite of all passing tests).

Note: I only flipped the switch for 1.9 since it turns out there's still one failure for 1.8:

1) JRuby's profiling mode reports unimplemneted methods like fork as unimplemented
     Failure/Error: Kernel.respond_to?(:fork).should == false
       expected: false
            got: true (using ==)
     # ./spec/profiler/profiler_basics_spec.rb:8:in `(root)'

Let me know if there's a strong desire to see 1.8 profile specs running in Travis and I'll try and send a follow-up pull addressing this.

dmarcotte added 3 commits Nov 6, 2015
`first` flag was incorrectly set, resulting in a leading comma for json
profile output.

Also remove some calls to rspec's `have`, which has been removed from
rspec since the profiler specs were last run.

This gets the spec/profiler specs green.
This was incorrectly reporting a failure because RSpec::Core::Runner now
returns an exit status rather than true/false (it's *has* been a while
since this was run...)
@dmarcotte
Copy link
Contributor Author

dmarcotte commented Nov 6, 2015

@headius just noticed this guy was unmerged... just slipped off your radar too? (No worries if that's the case!) Or is there something we want to address here?

Also: I just rebased to the latest jruby-1_7, so Travis should soon (hopefully...) confirm everything is still cool here.

@enebo enebo added this to the JRuby 1.7.23 milestone Nov 9, 2015
enebo added a commit that referenced this pull request Nov 9, 2015
@enebo enebo merged commit 553cf61 into jruby:jruby-1_7 Nov 9, 2015
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants