Skip to content

(PUP-1100) Fix error message with create_resource and auto-loaded class#2761

Merged
adrienthebo merged 2 commits intopuppetlabs:masterfrom
roidelapluie:PUP-1100-fix
Jun 26, 2014
Merged

(PUP-1100) Fix error message with create_resource and auto-loaded class#2761
adrienthebo merged 2 commits intopuppetlabs:masterfrom
roidelapluie:PUP-1100-fix

Conversation

@roidelapluie
Copy link
Contributor

These commits fix the error message displayed by PM when a syntax error
is present on an auto-loaded file.

@puppetcla
Copy link

CLA signed by all contributors.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good overallt. The content of the expect { } block should be indented one level. There heredoc is gratuitous, seeing as it's a one line manifest, that should just be a 'string'.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done, rebased & force-pushed.

Julien Pivotto added 2 commits June 12, 2014 15:18
This commit adds a check for the create_resources syntax error message.
If there is a syntax error, the error given by puppet master is unclear.
This commits adds a test to check that the error message is correct and
makes sense.

This only happens when the resources are auto imported, which is why I
use a fixture directory.
This commit fixes the error message displayed by PM when a syntax error
is present on an file auto-loaded by create_resources.
adrienthebo added a commit that referenced this pull request Jun 26, 2014
 (PUP-1100) Fix error message with create_resource and auto-loaded class
@adrienthebo adrienthebo merged commit c664ad0 into puppetlabs:master Jun 26, 2014
@adrienthebo
Copy link
Contributor

Merged into master in c664ad0, this should be released in 3.7.0. Thanks for the contribution!

@roidelapluie roidelapluie deleted the PUP-1100-fix branch June 27, 2014 08:44
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.

4 participants