(maint) mergeup from 1.6.x: desc/docs cleanup #178
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bolt's `get_resources` uses the `libexec/query_resources.rb` to retrieve resources as json from the target nodes. Especially https://github.com/puppetlabs/bolt/blob/7dec6e49d66c7f9ae06088d46ee3330de0ed2fed/libexec/query_resources.rb#L71 causes `ResourceShims` to fail as they did not implement `to_json`. This integration test models what `libexec/query_resources.rb` is doing. The added `to_json(*)` method now passes this test, and - shown in manual testing - works for bolt.
(maint) backport minor fixes from master to 1.6.x
This implements the changes specified in puppetlabs/puppet-specifications#141 > The text and examples have been inconsistent with how `desc` vs `docs` > has been handled. This change fixes the text and examples to all show > and require `desc`, but accept `docs` in places where we showed it > previously.
…k-1.6.x (maint) implement `desc`/`docs` fallback
DavidS
force-pushed
the
maint-desc-docs-fallback
branch
from
15d5223
to
461d24c
Compare
DavidS
changed the title
DavidS
added
bug
maintenance
DavidS
changed the title
DavidS
changed the title
Without this the `provider` mock would leak between tests.
Before the fix:
```
david@davids:~/git/puppet-resource_api$ SPEC_OPTS="--exclude-pattern spec/\{fixtures/\*\*/\*.rb,fixtures/modules/\*/\*\*/\*.rb\}" bundle exec rspec ./spec/puppet/resource_api/transport_spec.rb[1:4:2:1] ./spec/puppet/resource_api_spec.rb[1:16:2:1] --seed 40589 -fd
Run options: include {:ids=>{"./spec/puppet/resource_api/transport_spec.rb"=>["1:4:2:1"], "./spec/puppet/resource_api_spec.rb"=>["1:16:2:1"]}}
Randomized with seed 40589
Puppet::ResourceApi::Transport
#inject_device(name, transport)
when puppet does not have set_device
wraps the transport and sets it as current in NetworkDevice
Puppet::ResourceApi
#load_provider
when loading a provider that doesn't create the correct class
should raise Puppet::DevError with message matching /provider class Puppet::Provider::NoClass::NoClass not found/ (FAILED - 1)
Failures:
1) Puppet::ResourceApi#load_provider when loading a provider that doesn't create the correct class should raise Puppet::DevError with message matching /provider class Puppet::Provider::NoClass::NoClass not found/
Failure/Error: it { expect { described_class.load_provider('no_class') }.to raise_error Puppet::DevError, %r{provider class Puppet::Provider::NoClass::NoClass not found} }
expected Puppet::DevError with message matching /provider class Puppet::Provider::NoClass::NoClass not found/, got #<Puppet::DevError: Found neither the device-specific provider class Puppet::Provider::NoClass::Mocks... the generic provider class Puppet::Provider::NoClass::NoClass in puppet/provider/no_class/no_class> with backtrace:
# ./lib/puppet/resource_api.rb:437:in `rescue in load_provider'
# ./lib/puppet/resource_api.rb:416:in `load_provider'
# ./spec/puppet/resource_api_spec.rb:1202:in `block (5 levels) in <top (required)>'
# ./spec/puppet/resource_api_spec.rb:1202:in `block (4 levels) in <top (required)>'
# ./spec/puppet/resource_api_spec.rb:1202:in `block (4 levels) in <top (required)>'
Finished in 0.05427 seconds (files took 0.94482 seconds to load)
2 examples, 1 failure
Failed examples:
rspec ./spec/puppet/resource_api_spec.rb:1202 # Puppet::ResourceApi#load_provider when loading a provider that doesn't create the correct class should raise Puppet::DevError with message matching /provider class Puppet::Provider::NoClass::NoClass not found/
Randomized with seed 40589
david@davids:~/git/puppet-resource_api$
```
After the fix:
```
david@davids:~/git/puppet-resource_api$ SPEC_OPTS="--exclude-pattern spec/\{fixtures/\*\*/\*.rb,fixtures/modules/\*/\*\*/\*.rb\}" bundle exec rspec ./spec/puppet/resource_api/transport_spec.rb[1:4:2:1] ./spec/puppet/resource_api_spec.rb[1:16:2:1] --seed 40589 -fd
Run options: include {:ids=>{"./spec/puppet/resource_api/transport_spec.rb"=>["1:4:2:1"], "./spec/puppet/resource_api_spec.rb"=>["1:16:2:1"]}}
Randomized with seed 40589
Puppet::ResourceApi::Transport
#inject_device(name, transport)
when puppet does not have set_device
wraps the transport and sets it as current in NetworkDevice
Puppet::ResourceApi
#load_provider
when loading a provider that doesn't create the correct class
should raise Puppet::DevError with message matching /provider class Puppet::Provider::NoClass::NoClass not found/
Finished in 0.03734 seconds (files took 0.95637 seconds to load)
2 examples, 0 failures
Randomized with seed 40589
david@davids:~/git/puppet-resource_api$
```
|
This is now passing local testing. I'll tear it apart for easier merging tonight or tomorrow. There is still too much testing cr*p going on for me to be 100% confident in the changes. |
|
Updated #175 and created #185 with issues uncovered here. Part of the confusion is that |
|
Superseded by #186 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This merges up the changes from #177 and moves the bits around into the new classes of
BaseTypeDefinitionand friends.It also contains backported fixes that were already merged to master earlier and additional test fixes.