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

Add support for ProxyTimeout #1805

Merged
merged 3 commits into from
Jul 27, 2018
Merged

Conversation

agoodno
Copy link

@agoodno agoodno commented Jul 6, 2018

Separately changes the default for Timeout to the Apache default per this discussion. https://tickets.puppetlabs.com/browse/MODULES-5792.

@agoodno
Copy link
Author

agoodno commented Jul 6, 2018

I'm getting an error running the test suite (even before this change) related to the Apache version If I can get that solved, I can write a test for this change if necessary.

agoodnough@MMEM7107:~/src/puppetlabs-apache $ bundle exec rspec spec/unit/apache_version_spec.rb
Run options: include {:focus=>true}

All examples were filtered out; ignoring {:focus=>true}

Facter::Util::Fact
  apache_version
    with value
      should eq "2.4.16" (FAILED - 1)
  apache_version with empty OS
    with value
      should eq "2.4.6" (FAILED - 2)

Failures:

  1) Facter::Util::Fact apache_version with value should eq "2.4.16"
     Failure/Error: expect(Facter.fact(:apache_version).value).to eq('2.4.16')

       expected: "2.4.16"
            got: nil

       (compared using ==)
     # ./spec/unit/apache_version_spec.rb:17:in `block (4 levels) in <top (required)>'

  2) Facter::Util::Fact apache_version with empty OS with value should eq "2.4.6"
     Failure/Error: expect(Facter.fact(:apache_version).value).to eq('2.4.6')

       expected: "2.4.6"
            got: nil

       (compared using ==)
     # ./spec/unit/apache_version_spec.rb:32:in `block (4 levels) in <top (required)>'

Deprecation Warnings:

puppetlabs_spec_helper: defaults `mock_with` to `:mocha`. See https://github.com/puppetlabs/puppetlabs_spec_helper#mock_with to choose a sensible value for you


If you need more of the backtrace for any of these deprecations to
identify where to make the necessary changes, you can configure
`config.raise_errors_for_deprecations!`, and it will turn the
deprecation warnings into errors, giving you the full backtrace.

1 deprecation warning total

Finished in 0.06547 seconds (files took 1.34 seconds to load)
2 examples, 2 failures

Failed examples:

rspec ./spec/unit/apache_version_spec.rb:16 # Facter::Util::Fact apache_version with value should eq "2.4.16"
rspec ./spec/unit/apache_version_spec.rb:31 # Facter::Util::Fact apache_version with empty OS with value should eq "2.4.6"

@HelenCampbell
Copy link
Contributor

Hey @agoodno , thanks for this PR! I'm gunna get this merged in as I've put it through a testing pipeline and it ran clean.
As for your test failures above I think they may actually be caused by 'spec_prep' not being ran. Try using the built in rake task to run your tests locally like so - 'bundle exec rake spec', or run the 'bundle exec rake spec_prep' before you run your individual tests to make sure setup is complete. Hope this helps!

@HelenCampbell HelenCampbell merged commit df1d942 into puppetlabs:master Jul 27, 2018
@agoodno
Copy link
Author

agoodno commented Aug 7, 2018

Thanks for the merge! About the test suite failure, I am using the normal 'bundle exec rake spec' command when I get those errors. Is there a specific version of ruby I should be using? Currently running 2.4.1 using rvm on my Mac. Anyway, no problem, if it passed the pipeline, it's probably something small on my local machine.

cegeka-jenkins pushed a commit to cegeka/puppet-apache that referenced this pull request Jul 15, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants