puppet 5.5.12-x64-mingw32 → 5.5.13-x64-mingw32
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of puppet might be problematic. Click here for more details.
- checksums.yaml +4 -4
- data/Gemfile +0 -5
- data/Gemfile.lock +11 -11
- data/lib/puppet/application/filebucket.rb +4 -0
- data/lib/puppet/configurer.rb +9 -3
- data/lib/puppet/indirector/request.rb +26 -15
- data/lib/puppet/indirector/rest.rb +16 -7
- data/lib/puppet/network/http/connection.rb +15 -7
- data/lib/puppet/transaction/event_manager.rb +1 -5
- data/lib/puppet/type/file/source.rb +0 -1
- data/lib/puppet/util/http_proxy.rb +3 -2
- data/lib/puppet/version.rb +1 -1
- data/locales/puppet.pot +108 -36
- data/man/man5/puppet.conf.5 +2 -2
- data/man/man8/puppet-agent.8 +1 -1
- data/man/man8/puppet-apply.8 +1 -1
- data/man/man8/puppet-ca.8 +1 -1
- data/man/man8/puppet-catalog.8 +1 -1
- data/man/man8/puppet-cert.8 +1 -1
- data/man/man8/puppet-certificate.8 +1 -1
- data/man/man8/puppet-certificate_request.8 +1 -1
- data/man/man8/puppet-certificate_revocation_list.8 +1 -1
- data/man/man8/puppet-config.8 +1 -1
- data/man/man8/puppet-describe.8 +1 -1
- data/man/man8/puppet-device.8 +1 -1
- data/man/man8/puppet-doc.8 +1 -1
- data/man/man8/puppet-epp.8 +1 -1
- data/man/man8/puppet-facts.8 +1 -1
- data/man/man8/puppet-filebucket.8 +1 -1
- data/man/man8/puppet-generate.8 +1 -1
- data/man/man8/puppet-help.8 +1 -1
- data/man/man8/puppet-key.8 +1 -1
- data/man/man8/puppet-lookup.8 +1 -1
- data/man/man8/puppet-man.8 +1 -1
- data/man/man8/puppet-master.8 +1 -1
- data/man/man8/puppet-module.8 +1 -1
- data/man/man8/puppet-node.8 +1 -1
- data/man/man8/puppet-parser.8 +1 -1
- data/man/man8/puppet-plugin.8 +1 -1
- data/man/man8/puppet-report.8 +1 -1
- data/man/man8/puppet-resource.8 +1 -1
- data/man/man8/puppet-script.8 +1 -1
- data/man/man8/puppet-status.8 +1 -1
- data/man/man8/puppet.8 +2 -2
- data/spec/integration/agent/logging_spec.rb +5 -7
- data/spec/integration/application/apply_spec.rb +28 -26
- data/spec/integration/application/doc_spec.rb +1 -2
- data/spec/integration/application/lookup_spec.rb +5 -5
- data/spec/integration/configurer_spec.rb +5 -6
- data/spec/integration/defaults_spec.rb +5 -6
- data/spec/integration/directory_environments_spec.rb +1 -1
- data/spec/integration/faces/ca_spec.rb +2 -3
- data/spec/integration/faces/config_spec.rb +3 -4
- data/spec/integration/faces/documentation_spec.rb +0 -1
- data/spec/integration/faces/plugin_spec.rb +1 -1
- data/spec/integration/file_bucket/file_spec.rb +3 -5
- data/spec/integration/file_serving/content_spec.rb +0 -1
- data/spec/integration/file_serving/fileset_spec.rb +0 -1
- data/spec/integration/file_serving/metadata_spec.rb +0 -1
- data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
- data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
- data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
- data/spec/integration/indirector/facts/facter_spec.rb +5 -5
- data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
- data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
- data/spec/integration/indirector/node/ldap_spec.rb +2 -3
- data/spec/integration/network/authconfig_spec.rb +23 -24
- data/spec/integration/network/formats_spec.rb +0 -1
- data/spec/integration/network/http/api/indirected_routes_spec.rb +0 -1
- data/spec/integration/node/environment_spec.rb +0 -1
- data/spec/integration/node/facts_spec.rb +9 -10
- data/spec/integration/node_spec.rb +6 -7
- data/spec/integration/parser/catalog_spec.rb +4 -2
- data/spec/integration/parser/collection_spec.rb +1 -2
- data/spec/integration/parser/compiler_spec.rb +6 -6
- data/spec/integration/parser/scope_spec.rb +1 -1
- data/spec/integration/parser/undef_param_spec.rb +1 -1
- data/spec/integration/provider/cron/crontab_spec.rb +8 -10
- data/spec/integration/provider/mailalias/aliases_spec.rb +0 -1
- data/spec/integration/provider/mount_spec.rb +9 -9
- data/spec/integration/provider/service/init_spec.rb +4 -5
- data/spec/integration/provider/service/systemd_spec.rb +0 -2
- data/spec/integration/provider/service/windows_spec.rb +1 -2
- data/spec/integration/provider/ssh_authorized_key_spec.rb +6 -8
- data/spec/integration/provider/sshkey_spec.rb +6 -12
- data/spec/integration/provider/yumrepo_spec.rb +8 -12
- data/spec/integration/reference/providers_spec.rb +0 -1
- data/spec/integration/reports_spec.rb +1 -2
- data/spec/integration/resource/catalog_spec.rb +14 -17
- data/spec/integration/resource/type_collection_spec.rb +4 -5
- data/spec/integration/ssl/certificate_authority_spec.rb +0 -1
- data/spec/integration/ssl/certificate_request_spec.rb +0 -1
- data/spec/integration/ssl/certificate_revocation_list_spec.rb +0 -1
- data/spec/integration/ssl/host_spec.rb +0 -1
- data/spec/integration/ssl/key_spec.rb +0 -1
- data/spec/integration/test/test_helper_spec.rb +1 -2
- data/spec/integration/transaction/report_spec.rb +6 -11
- data/spec/integration/transaction_spec.rb +18 -19
- data/spec/integration/type/exec_spec.rb +0 -1
- data/spec/integration/type/file_spec.rb +13 -14
- data/spec/integration/type/nagios_spec.rb +3 -5
- data/spec/integration/type/package_spec.rb +19 -23
- data/spec/integration/type/tidy_spec.rb +1 -2
- data/spec/integration/type/user_spec.rb +0 -1
- data/spec/integration/type_spec.rb +0 -1
- data/spec/integration/util/autoload_spec.rb +1 -2
- data/spec/integration/util/rdoc/parser_spec.rb +0 -1
- data/spec/integration/util/settings_spec.rb +0 -1
- data/spec/integration/util/windows/adsi_spec.rb +3 -5
- data/spec/integration/util/windows/principal_spec.rb +0 -1
- data/spec/integration/util/windows/process_spec.rb +4 -6
- data/spec/integration/util/windows/registry_spec.rb +41 -51
- data/spec/integration/util/windows/security_spec.rb +2 -4
- data/spec/integration/util/windows/user_spec.rb +18 -20
- data/spec/integration/util_spec.rb +4 -7
- data/spec/lib/puppet_spec/compiler.rb +1 -1
- data/spec/lib/puppet_spec/files.rb +0 -1
- data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
- data/spec/lib/puppet_spec/scope.rb +1 -2
- data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
- data/spec/shared_behaviours/file_server_terminus.rb +8 -9
- data/spec/shared_behaviours/file_serving.rb +6 -8
- data/spec/shared_behaviours/file_serving_model.rb +4 -6
- data/spec/shared_behaviours/hiera_indirections.rb +3 -4
- data/spec/shared_behaviours/iterative_functions.rb +0 -1
- data/spec/shared_behaviours/memory_terminus.rb +2 -2
- data/spec/shared_examples/rhel_package_provider.rb +112 -70
- data/spec/spec_helper.rb +11 -2
- data/spec/unit/agent/disabler_spec.rb +4 -5
- data/spec/unit/agent/locker_spec.rb +12 -13
- data/spec/unit/agent_spec.rb +80 -85
- data/spec/unit/application/agent_spec.rb +88 -93
- data/spec/unit/application/apply_spec.rb +78 -79
- data/spec/unit/application/cert_spec.rb +42 -49
- data/spec/unit/application/certificate_spec.rb +2 -3
- data/spec/unit/application/config_spec.rb +0 -1
- data/spec/unit/application/describe_spec.rb +6 -7
- data/spec/unit/application/device_spec.rb +175 -184
- data/spec/unit/application/doc_spec.rb +44 -46
- data/spec/unit/application/face_base_spec.rb +61 -62
- data/spec/unit/application/facts_spec.rb +3 -4
- data/spec/unit/application/filebucket_spec.rb +66 -74
- data/spec/unit/application/indirection_base_spec.rb +8 -6
- data/spec/unit/application/lookup_spec.rb +26 -26
- data/spec/unit/application/master_spec.rb +95 -95
- data/spec/unit/application/resource_spec.rb +42 -48
- data/spec/unit/application_spec.rb +74 -84
- data/spec/unit/capability_spec.rb +9 -6
- data/spec/unit/configurer/downloader_spec.rb +20 -21
- data/spec/unit/configurer/fact_handler_spec.rb +2 -3
- data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
- data/spec/unit/configurer_spec.rb +190 -193
- data/spec/unit/confine/exists_spec.rb +17 -15
- data/spec/unit/confine/false_spec.rb +5 -6
- data/spec/unit/confine/feature_spec.rb +7 -5
- data/spec/unit/confine/true_spec.rb +5 -6
- data/spec/unit/confine/variable_spec.rb +14 -15
- data/spec/unit/confine_collection_spec.rb +28 -29
- data/spec/unit/confine_spec.rb +13 -14
- data/spec/unit/confiner_spec.rb +10 -11
- data/spec/unit/context/trusted_information_spec.rb +1 -1
- data/spec/unit/daemon_spec.rb +34 -35
- data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
- data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
- data/spec/unit/datatypes_spec.rb +3 -4
- data/spec/unit/defaults_spec.rb +17 -12
- data/spec/unit/environments_spec.rb +7 -7
- data/spec/unit/etc_spec.rb +30 -32
- data/spec/unit/external/pson_spec.rb +0 -1
- data/spec/unit/face/ca_spec.rb +0 -1
- data/spec/unit/face/catalog_spec.rb +0 -1
- data/spec/unit/face/certificate_request_spec.rb +0 -1
- data/spec/unit/face/certificate_revocation_list_spec.rb +0 -1
- data/spec/unit/face/certificate_spec.rb +7 -10
- data/spec/unit/face/config_spec.rb +31 -35
- data/spec/unit/face/epp_face_spec.rb +3 -4
- data/spec/unit/face/facts_spec.rb +5 -6
- data/spec/unit/face/generate_spec.rb +4 -5
- data/spec/unit/face/help_spec.rb +7 -8
- data/spec/unit/face/key_spec.rb +0 -1
- data/spec/unit/face/man_spec.rb +1 -2
- data/spec/unit/face/module/build_spec.rb +17 -17
- data/spec/unit/face/module/install_spec.rb +3 -5
- data/spec/unit/face/module/list_spec.rb +2 -12
- data/spec/unit/face/module/search_spec.rb +11 -9
- data/spec/unit/face/module/uninstall_spec.rb +4 -8
- data/spec/unit/face/node_spec.rb +33 -34
- data/spec/unit/face/parser_spec.rb +3 -3
- data/spec/unit/face/plugin_spec.rb +36 -9
- data/spec/unit/face/status_spec.rb +0 -1
- data/spec/unit/file_bucket/dipper_spec.rb +24 -20
- data/spec/unit/file_bucket/file_spec.rb +0 -2
- data/spec/unit/file_serving/base_spec.rb +16 -17
- data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
- data/spec/unit/file_serving/configuration_spec.rb +63 -66
- data/spec/unit/file_serving/content_spec.rb +10 -11
- data/spec/unit/file_serving/fileset_spec.rb +63 -58
- data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
- data/spec/unit/file_serving/metadata_spec.rb +36 -36
- data/spec/unit/file_serving/mount/file_spec.rb +31 -32
- data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
- data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
- data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
- data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
- data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
- data/spec/unit/file_serving/mount_spec.rb +0 -1
- data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
- data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
- data/spec/unit/file_system/uniquefile_spec.rb +4 -4
- data/spec/unit/file_system_spec.rb +2 -2
- data/spec/unit/forge/errors_spec.rb +1 -1
- data/spec/unit/forge/forge_spec.rb +13 -14
- data/spec/unit/forge/module_release_spec.rb +18 -18
- data/spec/unit/forge/repository_spec.rb +29 -30
- data/spec/unit/forge_spec.rb +15 -11
- data/spec/unit/functions/binary_file_spec.rb +3 -3
- data/spec/unit/functions/contain_spec.rb +0 -2
- data/spec/unit/functions/defined_spec.rb +0 -1
- data/spec/unit/functions/epp_spec.rb +2 -2
- data/spec/unit/functions/find_file_spec.rb +7 -7
- data/spec/unit/functions/include_spec.rb +0 -4
- data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
- data/spec/unit/functions/lookup_spec.rb +1 -2
- data/spec/unit/functions/module_directory_spec.rb +12 -12
- data/spec/unit/functions/require_spec.rb +0 -3
- data/spec/unit/functions/shared.rb +5 -8
- data/spec/unit/functions/versioncmp_spec.rb +1 -2
- data/spec/unit/functions4_spec.rb +7 -8
- data/spec/unit/gettext/config_spec.rb +4 -4
- data/spec/unit/gettext/module_loading_spec.rb +7 -7
- data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
- data/spec/unit/graph/relationship_graph_spec.rb +1 -2
- data/spec/unit/graph/simple_graph_spec.rb +8 -9
- data/spec/unit/hiera_puppet_spec.rb +20 -20
- data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
- data/spec/unit/indirector/catalog/json_spec.rb +1 -2
- data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
- data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
- data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
- data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
- data/spec/unit/indirector/certificate/ca_spec.rb +2 -4
- data/spec/unit/indirector/certificate/disabled_ca_spec.rb +1 -2
- data/spec/unit/indirector/certificate/file_spec.rb +2 -3
- data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
- data/spec/unit/indirector/certificate_request/ca_spec.rb +0 -1
- data/spec/unit/indirector/certificate_request/disabled_ca_spec.rb +1 -2
- data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
- data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
- data/spec/unit/indirector/certificate_revocation_list/ca_spec.rb +1 -2
- data/spec/unit/indirector/certificate_revocation_list/disabled_ca_spec.rb +1 -2
- data/spec/unit/indirector/certificate_revocation_list/file_spec.rb +1 -2
- data/spec/unit/indirector/certificate_revocation_list/rest_spec.rb +2 -3
- data/spec/unit/indirector/certificate_status/file_spec.rb +2 -3
- data/spec/unit/indirector/certificate_status/rest_spec.rb +0 -1
- data/spec/unit/indirector/code_spec.rb +5 -6
- data/spec/unit/indirector/direct_file_server_spec.rb +33 -27
- data/spec/unit/indirector/envelope_spec.rb +1 -2
- data/spec/unit/indirector/exec_spec.rb +15 -14
- data/spec/unit/indirector/face_spec.rb +9 -9
- data/spec/unit/indirector/facts/facter_spec.rb +37 -43
- data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
- data/spec/unit/indirector/facts/rest_spec.rb +7 -8
- data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
- data/spec/unit/indirector/facts/yaml_spec.rb +2 -4
- data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
- data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
- data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
- data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
- data/spec/unit/indirector/file_content/file_spec.rb +0 -1
- data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
- data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
- data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
- data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
- data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
- data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
- data/spec/unit/indirector/file_server_spec.rb +99 -93
- data/spec/unit/indirector/indirection_spec.rb +242 -226
- data/spec/unit/indirector/json_spec.rb +7 -9
- data/spec/unit/indirector/key/ca_spec.rb +2 -3
- data/spec/unit/indirector/key/disabled_ca_spec.rb +1 -2
- data/spec/unit/indirector/key/file_spec.rb +25 -26
- data/spec/unit/indirector/ldap_spec.rb +34 -41
- data/spec/unit/indirector/memory_spec.rb +6 -7
- data/spec/unit/indirector/msgpack_spec.rb +7 -9
- data/spec/unit/indirector/node/exec_spec.rb +6 -6
- data/spec/unit/indirector/node/ldap_spec.rb +74 -76
- data/spec/unit/indirector/node/memory_spec.rb +2 -4
- data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
- data/spec/unit/indirector/node/plain_spec.rb +2 -4
- data/spec/unit/indirector/node/rest_spec.rb +0 -1
- data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
- data/spec/unit/indirector/node/write_only_yaml_spec.rb +1 -2
- data/spec/unit/indirector/node/yaml_spec.rb +0 -1
- data/spec/unit/indirector/none_spec.rb +5 -5
- data/spec/unit/indirector/plain_spec.rb +7 -8
- data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
- data/spec/unit/indirector/report/processor_spec.rb +21 -22
- data/spec/unit/indirector/report/rest_spec.rb +11 -12
- data/spec/unit/indirector/report/yaml_spec.rb +0 -1
- data/spec/unit/indirector/request_spec.rb +11 -12
- data/spec/unit/indirector/resource/ral_spec.rb +47 -54
- data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
- data/spec/unit/indirector/rest_spec.rb +113 -110
- data/spec/unit/indirector/ssl_file_spec.rb +74 -77
- data/spec/unit/indirector/status/local_spec.rb +0 -1
- data/spec/unit/indirector/status/rest_spec.rb +0 -1
- data/spec/unit/indirector/store_configs_spec.rb +0 -1
- data/spec/unit/indirector/terminus_spec.rb +31 -29
- data/spec/unit/indirector/yaml_spec.rb +33 -32
- data/spec/unit/indirector_spec.rb +1 -2
- data/spec/unit/info_service_spec.rb +3 -1
- data/spec/unit/interface/action_builder_spec.rb +0 -1
- data/spec/unit/interface/action_manager_spec.rb +0 -1
- data/spec/unit/interface/action_spec.rb +2 -3
- data/spec/unit/interface/documentation_spec.rb +0 -1
- data/spec/unit/interface/face_collection_spec.rb +19 -12
- data/spec/unit/interface_spec.rb +3 -3
- data/spec/unit/man_spec.rb +3 -4
- data/spec/unit/module_spec.rb +46 -51
- data/spec/unit/module_tool/applications/builder_spec.rb +5 -5
- data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
- data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
- data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
- data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
- data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
- data/spec/unit/module_tool/install_directory_spec.rb +8 -8
- data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
- data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
- data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
- data/spec/unit/module_tool/tar_spec.rb +12 -13
- data/spec/unit/module_tool_spec.rb +7 -12
- data/spec/unit/network/auth_config_parser_spec.rb +11 -13
- data/spec/unit/network/authconfig_spec.rb +17 -18
- data/spec/unit/network/authorization_spec.rb +4 -5
- data/spec/unit/network/authstore_spec.rb +0 -1
- data/spec/unit/network/format_handler_spec.rb +0 -1
- data/spec/unit/network/format_spec.rb +9 -10
- data/spec/unit/network/format_support_spec.rb +28 -29
- data/spec/unit/network/formats_spec.rb +4 -5
- data/spec/unit/network/http/api/ca/v1_spec.rb +1 -1
- data/spec/unit/network/http/api/indirected_routes_spec.rb +22 -29
- data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
- data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
- data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
- data/spec/unit/network/http/api_spec.rb +1 -3
- data/spec/unit/network/http/compression_spec.rb +21 -22
- data/spec/unit/network/http/connection_spec.rb +39 -36
- data/spec/unit/network/http/factory_spec.rb +5 -6
- data/spec/unit/network/http/handler_spec.rb +9 -18
- data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
- data/spec/unit/network/http/pool_spec.rb +28 -29
- data/spec/unit/network/http/rack/rest_spec.rb +24 -27
- data/spec/unit/network/http/rack_spec.rb +5 -6
- data/spec/unit/network/http/request_spec.rb +0 -2
- data/spec/unit/network/http/response_spec.rb +11 -13
- data/spec/unit/network/http/route_spec.rb +0 -1
- data/spec/unit/network/http/session_spec.rb +1 -2
- data/spec/unit/network/http/site_spec.rb +0 -1
- data/spec/unit/network/http/webrick/rest_spec.rb +40 -41
- data/spec/unit/network/http/webrick_spec.rb +49 -52
- data/spec/unit/network/http_pool_spec.rb +18 -9
- data/spec/unit/network/http_spec.rb +0 -1
- data/spec/unit/network/resolver_spec.rb +16 -17
- data/spec/unit/network/rights_spec.rb +52 -53
- data/spec/unit/network/server_spec.rb +12 -13
- data/spec/unit/node/environment_spec.rb +16 -14
- data/spec/unit/node/facts_spec.rb +5 -7
- data/spec/unit/node_spec.rb +4 -10
- data/spec/unit/other/selinux_spec.rb +2 -3
- data/spec/unit/parameter/boolean_spec.rb +1 -2
- data/spec/unit/parameter/package_options_spec.rb +1 -2
- data/spec/unit/parameter/path_spec.rb +0 -1
- data/spec/unit/parameter/value_collection_spec.rb +0 -1
- data/spec/unit/parameter/value_spec.rb +0 -1
- data/spec/unit/parameter_spec.rb +9 -9
- data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
- data/spec/unit/parser/ast/leaf_spec.rb +20 -21
- data/spec/unit/parser/compiler_spec.rb +84 -96
- data/spec/unit/parser/environment_compiler_spec.rb +11 -9
- data/spec/unit/parser/files_spec.rb +0 -1
- data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
- data/spec/unit/parser/functions/digest_spec.rb +0 -1
- data/spec/unit/parser/functions/fail_spec.rb +1 -2
- data/spec/unit/parser/functions/file_spec.rb +13 -14
- data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
- data/spec/unit/parser/functions/generate_spec.rb +7 -8
- data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
- data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
- data/spec/unit/parser/functions/scanf_spec.rb +0 -1
- data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
- data/spec/unit/parser/functions/split_spec.rb +0 -1
- data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
- data/spec/unit/parser/functions/tag_spec.rb +1 -2
- data/spec/unit/parser/functions/tagged_spec.rb +2 -3
- data/spec/unit/parser/functions/template_spec.rb +13 -13
- data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
- data/spec/unit/parser/functions_spec.rb +3 -4
- data/spec/unit/parser/relationship_spec.rb +0 -1
- data/spec/unit/parser/resource_spec.rb +42 -42
- data/spec/unit/parser/scope_spec.rb +39 -35
- data/spec/unit/parser/templatewrapper_spec.rb +11 -12
- data/spec/unit/parser/type_loader_spec.rb +17 -19
- data/spec/unit/pops/adaptable_spec.rb +0 -1
- data/spec/unit/pops/benchmark_spec.rb +0 -1
- data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
- data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
- data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
- data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
- data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
- data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
- data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +6 -6
- data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
- data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
- data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
- data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
- data/spec/unit/pops/factory_spec.rb +3 -4
- data/spec/unit/pops/issues_spec.rb +19 -20
- data/spec/unit/pops/loaders/loader_spec.rb +8 -4
- data/spec/unit/pops/loaders/loaders_spec.rb +30 -27
- data/spec/unit/pops/lookup/context_spec.rb +0 -1
- data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
- data/spec/unit/pops/merge_strategy_spec.rb +0 -1
- data/spec/unit/pops/migration_spec.rb +3 -5
- data/spec/unit/pops/model/model_spec.rb +0 -1
- data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
- data/spec/unit/pops/parser/locator_spec.rb +3 -6
- data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
- data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
- data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
- data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
- data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
- data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
- data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
- data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
- data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
- data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
- data/spec/unit/pops/pn_spec.rb +0 -1
- data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
- data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
- data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
- data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
- data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
- data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
- data/spec/unit/pops/types/type_calculator_spec.rb +36 -36
- data/spec/unit/pops/types/type_parser_spec.rb +13 -13
- data/spec/unit/pops/validator/validator_spec.rb +1 -2
- data/spec/unit/pops/visitor_spec.rb +0 -1
- data/spec/unit/property/boolean_spec.rb +1 -1
- data/spec/unit/property/ensure_spec.rb +0 -1
- data/spec/unit/property/keyvalue_spec.rb +32 -34
- data/spec/unit/property/list_spec.rb +26 -27
- data/spec/unit/property/ordered_list_spec.rb +10 -14
- data/spec/unit/property_spec.rb +42 -43
- data/spec/unit/provider/aix_object_spec.rb +47 -45
- data/spec/unit/provider/augeas/augeas_spec.rb +192 -192
- data/spec/unit/provider/cisco_spec.rb +1 -2
- data/spec/unit/provider/command_spec.rb +9 -9
- data/spec/unit/provider/cron/crontab_spec.rb +10 -11
- data/spec/unit/provider/cron/parsed_spec.rb +22 -24
- data/spec/unit/provider/exec/posix_spec.rb +6 -7
- data/spec/unit/provider/exec/shell_spec.rb +0 -1
- data/spec/unit/provider/exec/windows_spec.rb +2 -4
- data/spec/unit/provider/exec_spec.rb +0 -1
- data/spec/unit/provider/file/posix_spec.rb +22 -24
- data/spec/unit/provider/file/windows_spec.rb +15 -17
- data/spec/unit/provider/group/aix_spec.rb +3 -2
- data/spec/unit/provider/group/groupadd_spec.rb +30 -26
- data/spec/unit/provider/group/ldap_spec.rb +18 -18
- data/spec/unit/provider/group/pw_spec.rb +11 -11
- data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
- data/spec/unit/provider/host/parsed_spec.rb +6 -6
- data/spec/unit/provider/interface/cisco_spec.rb +20 -24
- data/spec/unit/provider/ldap_spec.rb +61 -62
- data/spec/unit/provider/macauthorization_spec.rb +26 -47
- data/spec/unit/provider/mcx/mcxcontent_spec.rb +45 -47
- data/spec/unit/provider/mount/parsed_spec.rb +18 -24
- data/spec/unit/provider/mount_spec.rb +57 -66
- data/spec/unit/provider/naginator_spec.rb +13 -14
- data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
- data/spec/unit/provider/nameservice_spec.rb +38 -40
- data/spec/unit/provider/network_device_spec.rb +28 -28
- data/spec/unit/provider/package/aix_spec.rb +15 -15
- data/spec/unit/provider/package/appdmg_spec.rb +13 -13
- data/spec/unit/provider/package/apt_spec.rb +44 -27
- data/spec/unit/provider/package/aptitude_spec.rb +6 -7
- data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
- data/spec/unit/provider/package/base_spec.rb +4 -4
- data/spec/unit/provider/package/dnf_spec.rb +14 -16
- data/spec/unit/provider/package/dpkg_spec.rb +52 -52
- data/spec/unit/provider/package/freebsd_spec.rb +11 -11
- data/spec/unit/provider/package/gem_spec.rb +51 -43
- data/spec/unit/provider/package/hpux_spec.rb +8 -8
- data/spec/unit/provider/package/macports_spec.rb +46 -42
- data/spec/unit/provider/package/nim_spec.rb +30 -39
- data/spec/unit/provider/package/openbsd_spec.rb +36 -39
- data/spec/unit/provider/package/opkg_spec.rb +23 -26
- data/spec/unit/provider/package/pacman_spec.rb +97 -118
- data/spec/unit/provider/package/pip_spec.rb +69 -71
- data/spec/unit/provider/package/pkg_spec.rb +109 -109
- data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
- data/spec/unit/provider/package/pkgin_spec.rb +10 -8
- data/spec/unit/provider/package/pkgng_spec.rb +17 -18
- data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
- data/spec/unit/provider/package/portage_spec.rb +70 -74
- data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
- data/spec/unit/provider/package/rpm_spec.rb +53 -64
- data/spec/unit/provider/package/sun_spec.rb +16 -18
- data/spec/unit/provider/package/tdnf_spec.rb +2 -2
- data/spec/unit/provider/package/up2date_spec.rb +2 -4
- data/spec/unit/provider/package/urpmi_spec.rb +15 -17
- data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
- data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
- data/spec/unit/provider/package/windows/package_spec.rb +37 -42
- data/spec/unit/provider/package/windows_spec.rb +36 -32
- data/spec/unit/provider/package/yum_spec.rb +4 -4
- data/spec/unit/provider/package/zypper_spec.rb +87 -87
- data/spec/unit/provider/parsedfile_spec.rb +44 -45
- data/spec/unit/provider/scheduled_task/win32_taskscheduler_spec.rb +120 -130
- data/spec/unit/provider/selboolean_spec.rb +9 -11
- data/spec/unit/provider/selmodule_spec.rb +20 -22
- data/spec/unit/provider/service/base_spec.rb +4 -5
- data/spec/unit/provider/service/bsd_spec.rb +27 -29
- data/spec/unit/provider/service/daemontools_spec.rb +35 -35
- data/spec/unit/provider/service/debian_spec.rb +37 -37
- data/spec/unit/provider/service/freebsd_spec.rb +18 -18
- data/spec/unit/provider/service/gentoo_spec.rb +50 -56
- data/spec/unit/provider/service/init_spec.rb +55 -55
- data/spec/unit/provider/service/launchd_spec.rb +138 -116
- data/spec/unit/provider/service/openbsd_spec.rb +50 -50
- data/spec/unit/provider/service/openrc_spec.rb +43 -46
- data/spec/unit/provider/service/openwrt_spec.rb +26 -32
- data/spec/unit/provider/service/rcng_spec.rb +14 -14
- data/spec/unit/provider/service/redhat_spec.rb +45 -43
- data/spec/unit/provider/service/runit_spec.rb +29 -27
- data/spec/unit/provider/service/smf_spec.rb +74 -66
- data/spec/unit/provider/service/src_spec.rb +46 -47
- data/spec/unit/provider/service/systemd_spec.rb +93 -98
- data/spec/unit/provider/service/upstart_spec.rb +74 -72
- data/spec/unit/provider/service/windows_spec.rb +33 -41
- data/spec/unit/provider/ssh_authorized_key/parsed_spec.rb +54 -68
- data/spec/unit/provider/sshkey/parsed_spec.rb +7 -8
- data/spec/unit/provider/user/aix_spec.rb +31 -31
- data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
- data/spec/unit/provider/user/hpux_spec.rb +15 -15
- data/spec/unit/provider/user/ldap_spec.rb +57 -57
- data/spec/unit/provider/user/openbsd_spec.rb +10 -12
- data/spec/unit/provider/user/pw_spec.rb +37 -35
- data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
- data/spec/unit/provider/user/useradd_spec.rb +93 -92
- data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
- data/spec/unit/provider/vlan/cisco_spec.rb +10 -12
- data/spec/unit/provider/yumrepo/inifile_spec.rb +75 -80
- data/spec/unit/provider/zfs/zfs_spec.rb +26 -21
- data/spec/unit/provider/zone/solaris_spec.rb +56 -42
- data/spec/unit/provider/zpool/zpool_spec.rb +19 -20
- data/spec/unit/provider_spec.rb +29 -29
- data/spec/unit/puppet_pal_2pec.rb +4 -5
- data/spec/unit/puppet_pal_spec.rb +0 -1
- data/spec/unit/puppet_spec.rb +7 -8
- data/spec/unit/relationship_spec.rb +0 -1
- data/spec/unit/reports/http_spec.rb +21 -23
- data/spec/unit/reports/store_spec.rb +3 -4
- data/spec/unit/reports_spec.rb +12 -14
- data/spec/unit/resource/capability_finder_spec.rb +18 -16
- data/spec/unit/resource/catalog_spec.rb +72 -68
- data/spec/unit/resource/status_spec.rb +6 -8
- data/spec/unit/resource/type_collection_spec.rb +17 -18
- data/spec/unit/resource/type_spec.rb +34 -35
- data/spec/unit/resource_spec.rb +36 -32
- data/spec/unit/scheduler/job_spec.rb +0 -1
- data/spec/unit/scheduler/scheduler_spec.rb +0 -1
- data/spec/unit/scheduler/splay_job_spec.rb +1 -2
- data/spec/unit/settings/array_setting_spec.rb +1 -1
- data/spec/unit/settings/autosign_setting_spec.rb +9 -9
- data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
- data/spec/unit/settings/config_file_spec.rb +0 -1
- data/spec/unit/settings/directory_setting_spec.rb +2 -7
- data/spec/unit/settings/duration_setting_spec.rb +1 -2
- data/spec/unit/settings/enum_setting_spec.rb +1 -1
- data/spec/unit/settings/environment_conf_spec.rb +4 -6
- data/spec/unit/settings/file_setting_spec.rb +44 -46
- data/spec/unit/settings/path_setting_spec.rb +1 -2
- data/spec/unit/settings/priority_setting_spec.rb +1 -2
- data/spec/unit/settings/string_setting_spec.rb +14 -15
- data/spec/unit/settings/terminus_setting_spec.rb +1 -2
- data/spec/unit/settings/value_translator_spec.rb +0 -1
- data/spec/unit/settings_spec.rb +226 -233
- data/spec/unit/ssl/base_spec.rb +14 -15
- data/spec/unit/ssl/certificate_authority/autosign_command_spec.rb +6 -7
- data/spec/unit/ssl/certificate_authority/interface_spec.rb +116 -113
- data/spec/unit/ssl/certificate_authority_spec.rb +258 -268
- data/spec/unit/ssl/certificate_factory_spec.rb +3 -5
- data/spec/unit/ssl/certificate_request_attributes_spec.rb +2 -3
- data/spec/unit/ssl/certificate_request_spec.rb +66 -67
- data/spec/unit/ssl/certificate_revocation_list_spec.rb +3 -4
- data/spec/unit/ssl/certificate_spec.rb +23 -25
- data/spec/unit/ssl/configuration_spec.rb +1 -4
- data/spec/unit/ssl/digest_spec.rb +0 -1
- data/spec/unit/ssl/host_spec.rb +217 -188
- data/spec/unit/ssl/inventory_spec.rb +25 -21
- data/spec/unit/ssl/key_spec.rb +30 -31
- data/spec/unit/ssl/validator_spec.rb +40 -40
- data/spec/unit/task_spec.rb +6 -7
- data/spec/unit/transaction/additional_resource_generator_spec.rb +6 -5
- data/spec/unit/transaction/event_manager_spec.rb +88 -88
- data/spec/unit/transaction/event_spec.rb +16 -15
- data/spec/unit/transaction/persistence_spec.rb +16 -17
- data/spec/unit/transaction/report_spec.rb +11 -12
- data/spec/unit/transaction/resource_harness_spec.rb +28 -33
- data/spec/unit/transaction_spec.rb +98 -100
- data/spec/unit/type/augeas_spec.rb +11 -10
- data/spec/unit/type/component_spec.rb +0 -1
- data/spec/unit/type/computer_spec.rb +7 -10
- data/spec/unit/type/cron_spec.rb +3 -7
- data/spec/unit/type/exec_spec.rb +60 -56
- data/spec/unit/type/file/checksum_spec.rb +9 -10
- data/spec/unit/type/file/checksum_value_spec.rb +31 -32
- data/spec/unit/type/file/content_spec.rb +58 -61
- data/spec/unit/type/file/ctime_spec.rb +0 -1
- data/spec/unit/type/file/ensure_spec.rb +12 -13
- data/spec/unit/type/file/group_spec.rb +5 -7
- data/spec/unit/type/file/mode_spec.rb +4 -6
- data/spec/unit/type/file/mtime_spec.rb +0 -1
- data/spec/unit/type/file/owner_spec.rb +6 -8
- data/spec/unit/type/file/selinux_spec.rb +17 -19
- data/spec/unit/type/file/source_spec.rb +104 -101
- data/spec/unit/type/file/type_spec.rb +0 -1
- data/spec/unit/type/file_spec.rb +195 -185
- data/spec/unit/type/filebucket_spec.rb +4 -5
- data/spec/unit/type/group_spec.rb +6 -8
- data/spec/unit/type/host_spec.rb +2 -3
- data/spec/unit/type/interface_spec.rb +2 -3
- data/spec/unit/type/k5login_spec.rb +3 -4
- data/spec/unit/type/macauthorization_spec.rb +6 -8
- data/spec/unit/type/mailalias_spec.rb +2 -3
- data/spec/unit/type/maillist_spec.rb +6 -9
- data/spec/unit/type/mcx_spec.rb +4 -8
- data/spec/unit/type/mount_spec.rb +26 -38
- data/spec/unit/type/nagios_spec.rb +0 -1
- data/spec/unit/type/noop_metaparam_spec.rb +1 -2
- data/spec/unit/type/package/package_settings_spec.rb +44 -23
- data/spec/unit/type/package_spec.rb +53 -54
- data/spec/unit/type/resources_spec.rb +86 -88
- data/spec/unit/type/schedule_spec.rb +24 -26
- data/spec/unit/type/scheduled_task_spec.rb +1 -2
- data/spec/unit/type/selboolean_spec.rb +5 -6
- data/spec/unit/type/selmodule_spec.rb +0 -1
- data/spec/unit/type/service_spec.rb +47 -47
- data/spec/unit/type/ssh_authorized_key_spec.rb +5 -35
- data/spec/unit/type/sshkey_spec.rb +0 -2
- data/spec/unit/type/stage_spec.rb +0 -1
- data/spec/unit/type/tidy_spec.rb +61 -62
- data/spec/unit/type/user_spec.rb +41 -27
- data/spec/unit/type/vlan_spec.rb +2 -4
- data/spec/unit/type/whit_spec.rb +0 -1
- data/spec/unit/type/zfs_spec.rb +6 -7
- data/spec/unit/type/zone_spec.rb +14 -4
- data/spec/unit/type/zpool_spec.rb +4 -5
- data/spec/unit/type_spec.rb +54 -53
- data/spec/unit/util/at_fork_spec.rb +18 -19
- data/spec/unit/util/autoload_spec.rb +53 -54
- data/spec/unit/util/backups_spec.rb +34 -35
- data/spec/unit/util/character_encoding_spec.rb +8 -8
- data/spec/unit/util/checksums_spec.rb +38 -39
- data/spec/unit/util/colors_spec.rb +1 -2
- data/spec/unit/util/command_line_spec.rb +24 -25
- data/spec/unit/util/constant_inflector_spec.rb +0 -1
- data/spec/unit/util/diff_spec.rb +7 -8
- data/spec/unit/util/errors_spec.rb +0 -1
- data/spec/unit/util/execution_spec.rb +187 -162
- data/spec/unit/util/execution_stub_spec.rb +0 -1
- data/spec/unit/util/feature_spec.rb +13 -13
- data/spec/unit/util/filetype_spec.rb +49 -49
- data/spec/unit/util/http_proxy_spec.rb +12 -12
- data/spec/unit/util/inifile_spec.rb +26 -31
- data/spec/unit/util/json_lockfile_spec.rb +3 -5
- data/spec/unit/util/ldap/connection_spec.rb +26 -25
- data/spec/unit/util/ldap/generator_spec.rb +0 -1
- data/spec/unit/util/ldap/manager_spec.rb +102 -101
- data/spec/unit/util/lockfile_spec.rb +0 -1
- data/spec/unit/util/log/destinations_spec.rb +30 -33
- data/spec/unit/util/log_spec.rb +35 -36
- data/spec/unit/util/logging_spec.rb +58 -66
- data/spec/unit/util/metric_spec.rb +0 -1
- data/spec/unit/util/monkey_patches_spec.rb +7 -9
- data/spec/unit/util/multi_match_spec.rb +0 -1
- data/spec/unit/util/nagios_maker_spec.rb +35 -36
- data/spec/unit/util/network_device/cisco/device_spec.rb +59 -50
- data/spec/unit/util/network_device/cisco/facts_spec.rb +4 -5
- data/spec/unit/util/network_device/cisco/interface_spec.rb +29 -20
- data/spec/unit/util/network_device/config_spec.rb +0 -1
- data/spec/unit/util/network_device/ipcalc_spec.rb +0 -1
- data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
- data/spec/unit/util/network_device/transport/ssh_spec.rb +94 -60
- data/spec/unit/util/network_device/transport/telnet_spec.rb +18 -14
- data/spec/unit/util/network_device_spec.rb +7 -9
- data/spec/unit/util/package_spec.rb +0 -1
- data/spec/unit/util/pidlock_spec.rb +13 -14
- data/spec/unit/util/plist_spec.rb +40 -33
- data/spec/unit/util/posix_spec.rb +54 -51
- data/spec/unit/util/rdoc_spec.rb +9 -10
- data/spec/unit/util/reference_spec.rb +0 -1
- data/spec/unit/util/resource_template_spec.rb +20 -20
- data/spec/unit/util/retry_action_spec.rb +7 -8
- data/spec/unit/util/rubygems_spec.rb +14 -14
- data/spec/unit/util/run_mode_spec.rb +3 -4
- data/spec/unit/util/selinux_spec.rb +79 -72
- data/spec/unit/util/splayer_spec.rb +8 -9
- data/spec/unit/util/ssl_spec.rb +0 -1
- data/spec/unit/util/storage_spec.rb +3 -4
- data/spec/unit/util/suidmanager_spec.rb +45 -54
- data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
- data/spec/unit/util/tag_set_spec.rb +0 -1
- data/spec/unit/util/tagging_spec.rb +0 -1
- data/spec/unit/util/terminal_spec.rb +9 -10
- data/spec/unit/util/user_attr_spec.rb +1 -2
- data/spec/unit/util/warnings_spec.rb +3 -4
- data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
- data/spec/unit/util/watcher_spec.rb +51 -21
- data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
- data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
- data/spec/unit/util/windows/adsi_spec.rb +136 -138
- data/spec/unit/util/windows/api_types_spec.rb +0 -1
- data/spec/unit/util/windows/eventlog_spec.rb +9 -12
- data/spec/unit/util/windows/file_spec.rb +0 -1
- data/spec/unit/util/windows/root_certs_spec.rb +0 -1
- data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
- data/spec/unit/util/windows/service_spec.rb +66 -68
- data/spec/unit/util/windows/sid_spec.rb +11 -13
- data/spec/unit/util/windows/string_spec.rb +0 -1
- data/spec/unit/util_spec.rb +55 -59
- data/spec/unit/version_spec.rb +6 -6
- metadata +2 -2
@@ -1,4 +1,3 @@
|
|
1
|
-
#! /usr/bin/env ruby
|
2
1
|
require 'spec_helper'
|
3
2
|
require_relative '../pops/parser/parser_rspec_helper'
|
4
3
|
require 'puppet/resource/capability_finder'
|
@@ -6,12 +5,16 @@ require 'puppet/resource/capability_finder'
|
|
6
5
|
describe Puppet::Resource::CapabilityFinder do
|
7
6
|
context 'when PuppetDB is not configured' do
|
8
7
|
it 'should error' do
|
9
|
-
Puppet::Util.
|
8
|
+
expect(Puppet::Util).to receive(:const_defined?).with('Puppetdb').and_return(false)
|
10
9
|
expect { Puppet::Resource::CapabilityFinder.find('production', nil, nil) }.to raise_error(/PuppetDB is not available/)
|
11
10
|
end
|
12
11
|
end
|
13
12
|
|
14
13
|
context 'when PuppetDB is configured' do
|
14
|
+
before(:each) do
|
15
|
+
allow_any_instance_of(Puppet::Parser::Compiler).to receive(:loaders).and_return(loaders)
|
16
|
+
end
|
17
|
+
|
15
18
|
around(:each) do |example|
|
16
19
|
mock_pdb = !Puppet::Util.const_defined?('Puppetdb')
|
17
20
|
if mock_pdb
|
@@ -20,7 +23,6 @@ describe Puppet::Resource::CapabilityFinder do
|
|
20
23
|
end
|
21
24
|
end
|
22
25
|
begin
|
23
|
-
Puppet::Parser::Compiler.any_instance.stubs(:loaders).returns(loaders)
|
24
26
|
Puppet.override(:loaders => loaders, :current_environment => env) do
|
25
27
|
make_cap_type
|
26
28
|
example.run
|
@@ -36,7 +38,7 @@ describe Puppet::Resource::CapabilityFinder do
|
|
36
38
|
let(:loaders) { Puppet::Pops::Loaders.new(env) }
|
37
39
|
|
38
40
|
let(:response_body) { [{"type"=>"Cap", "title"=>"cap", "parameters"=>{"host"=>"ahost"}}] }
|
39
|
-
let(:response) {
|
41
|
+
let(:response) { double('response', :body => response_body.to_json) }
|
40
42
|
|
41
43
|
def make_cap_type
|
42
44
|
Puppet::Type.newtype :cap, :is_capability => true do
|
@@ -47,8 +49,8 @@ describe Puppet::Resource::CapabilityFinder do
|
|
47
49
|
|
48
50
|
describe "when query_puppetdb method is available" do
|
49
51
|
it 'should call use the query_puppetdb method if available' do
|
50
|
-
Puppet::Util::Puppetdb.
|
51
|
-
Puppet::Util::Puppetdb::Http.
|
52
|
+
expect(Puppet::Util::Puppetdb).to receive(:query_puppetdb).and_return(response_body)
|
53
|
+
expect(Puppet::Util::Puppetdb::Http).not_to receive(:action)
|
52
54
|
|
53
55
|
result = Puppet::Resource::CapabilityFinder.find('production', nil, Puppet::Resource.new('Cap', 'cap'))
|
54
56
|
expect(result['host']).to eq('ahost')
|
@@ -57,11 +59,11 @@ describe Puppet::Resource::CapabilityFinder do
|
|
57
59
|
|
58
60
|
describe "when query_puppetdb method is unavailable" do
|
59
61
|
before :each do
|
60
|
-
Puppet::Util::Puppetdb.
|
62
|
+
allow(Puppet::Util::Puppetdb).to receive(:respond_to?).with(:query_puppetdb).and_return(false)
|
61
63
|
end
|
62
64
|
|
63
65
|
it 'should call Puppet::Util::PuppetDB::Http.action' do
|
64
|
-
Puppet::Util::Puppetdb::Http.
|
66
|
+
expect(Puppet::Util::Puppetdb::Http).to receive(:action).and_return(response)
|
65
67
|
result = Puppet::Resource::CapabilityFinder.find('production', nil, Puppet::Resource.new('Cap', 'cap'))
|
66
68
|
expect(result['host']).to eq('ahost')
|
67
69
|
end
|
@@ -73,14 +75,14 @@ describe Puppet::Resource::CapabilityFinder do
|
|
73
75
|
|
74
76
|
it 'should search for the resource without including code_id or environment' do
|
75
77
|
resources = [{"type"=>"Cap", "title"=>"cap", "parameters"=>{"host"=>"ahost"}}]
|
76
|
-
Puppet::Resource::CapabilityFinder.
|
78
|
+
allow(Puppet::Resource::CapabilityFinder).to receive(:search).with(nil, nil, capability).and_return(resources)
|
77
79
|
|
78
80
|
result = Puppet::Resource::CapabilityFinder.find('production', code_id, Puppet::Resource.new('Cap', 'cap'))
|
79
81
|
expect(result['host']).to eq('ahost')
|
80
82
|
end
|
81
83
|
|
82
84
|
it 'should return nil if no resource is found' do
|
83
|
-
Puppet::Resource::CapabilityFinder.
|
85
|
+
allow(Puppet::Resource::CapabilityFinder).to receive(:search).with(nil, nil, capability).and_return([])
|
84
86
|
|
85
87
|
result = Puppet::Resource::CapabilityFinder.find('production', code_id, capability)
|
86
88
|
expect(result).to be_nil
|
@@ -93,7 +95,7 @@ describe Puppet::Resource::CapabilityFinder do
|
|
93
95
|
end
|
94
96
|
|
95
97
|
before :each do
|
96
|
-
Puppet::Resource::CapabilityFinder.
|
98
|
+
allow(Puppet::Resource::CapabilityFinder).to receive(:search).with(nil, nil, capability).and_return(resources)
|
97
99
|
end
|
98
100
|
|
99
101
|
it 'should return the resource matching environment' do
|
@@ -114,30 +116,30 @@ describe Puppet::Resource::CapabilityFinder do
|
|
114
116
|
end
|
115
117
|
|
116
118
|
before :each do
|
117
|
-
Puppet::Resource::CapabilityFinder.
|
119
|
+
allow(Puppet::Resource::CapabilityFinder).to receive(:search).with(nil, nil, capability).and_return(resources)
|
118
120
|
end
|
119
121
|
|
120
122
|
it 'should return the resource matching code_id' do
|
121
|
-
Puppet::Resource::CapabilityFinder.
|
123
|
+
allow(Puppet::Resource::CapabilityFinder).to receive(:search).with('production', code_id, capability).and_return([{"type"=>"Cap", "title"=>"cap", "parameters"=>{"host"=>"chost"}}])
|
122
124
|
|
123
125
|
result = Puppet::Resource::CapabilityFinder.find('production', code_id, capability)
|
124
126
|
expect(result['host']).to eq('chost')
|
125
127
|
end
|
126
128
|
|
127
129
|
it 'should fail if no resource matches code_id' do
|
128
|
-
Puppet::Resource::CapabilityFinder.
|
130
|
+
allow(Puppet::Resource::CapabilityFinder).to receive(:search).with('production', code_id, capability).and_return([])
|
129
131
|
|
130
132
|
expect { Puppet::Resource::CapabilityFinder.find('production', code_id, capability) }.to raise_error(Puppet::Error, /expected exactly one resource but got 2/)
|
131
133
|
end
|
132
134
|
|
133
135
|
it 'should fail if multiple resources match code_id' do
|
134
|
-
Puppet::Resource::CapabilityFinder.
|
136
|
+
allow(Puppet::Resource::CapabilityFinder).to receive(:search).with('production', code_id, capability).and_return(resources)
|
135
137
|
|
136
138
|
expect { Puppet::Resource::CapabilityFinder.find('production', code_id, capability) }.to raise_error(Puppet::DevError, /expected exactly one resource but got 2/)
|
137
139
|
end
|
138
140
|
|
139
141
|
it 'should fail if no code_id was specified' do
|
140
|
-
Puppet::Resource::CapabilityFinder.
|
142
|
+
allow(Puppet::Resource::CapabilityFinder).to receive(:search).with('production', nil, capability).and_return(resources)
|
141
143
|
expect { Puppet::Resource::CapabilityFinder.find('production', nil, capability) }.to raise_error(Puppet::DevError, /expected exactly one resource but got 2/)
|
142
144
|
end
|
143
145
|
end
|
@@ -1,4 +1,3 @@
|
|
1
|
-
#! /usr/bin/env ruby
|
2
1
|
require 'spec_helper'
|
3
2
|
require 'puppet_spec/compiler'
|
4
3
|
|
@@ -11,7 +10,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
11
10
|
before do
|
12
11
|
@basepath = make_absolute("/somepath")
|
13
12
|
# stub this to not try to create state.yaml
|
14
|
-
Puppet::Util::Storage.
|
13
|
+
allow(Puppet::Util::Storage).to receive(:store)
|
15
14
|
end
|
16
15
|
|
17
16
|
it "should support json, pson, dot, yaml" do
|
@@ -71,11 +70,11 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
71
70
|
|
72
71
|
Puppet[:classfile] = File.expand_path("/class/file")
|
73
72
|
|
74
|
-
fh =
|
73
|
+
fh = double('filehandle')
|
75
74
|
classfile = Puppet.settings.setting(:classfile)
|
76
|
-
Puppet::FileSystem.
|
75
|
+
expect(Puppet::FileSystem).to receive(:open).with(classfile.value, classfile.mode.to_i(8), "w:UTF-8").and_yield(fh)
|
77
76
|
|
78
|
-
fh.
|
77
|
+
expect(fh).to receive(:puts).with("foo\nbar")
|
79
78
|
|
80
79
|
@catalog.write_class_file
|
81
80
|
end
|
@@ -98,7 +97,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
98
97
|
end
|
99
98
|
|
100
99
|
it "should include a catalog_uuid" do
|
101
|
-
SecureRandom.
|
100
|
+
allow(SecureRandom).to receive(:uuid).and_return("827a74c8-cf98-44da-9ff7-18c5e4bee41e")
|
102
101
|
catalog = Puppet::Resource::Catalog.new("host")
|
103
102
|
expect(catalog.catalog_uuid).to eq("827a74c8-cf98-44da-9ff7-18c5e4bee41e")
|
104
103
|
end
|
@@ -235,15 +234,29 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
235
234
|
@original.tag(*%w{one two three})
|
236
235
|
@original.add_class(*%w{four five six})
|
237
236
|
|
238
|
-
@r1 =
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
@
|
246
|
-
@
|
237
|
+
@r1 = double(
|
238
|
+
'r1',
|
239
|
+
:ref => "File[/a]",
|
240
|
+
:[] => nil,
|
241
|
+
:virtual => nil,
|
242
|
+
:catalog= => nil,
|
243
|
+
)
|
244
|
+
allow(@r1).to receive(:respond_to?)
|
245
|
+
allow(@r1).to receive(:respond_to?).with(:ref).and_return(true)
|
246
|
+
allow(@r1).to receive(:copy_as_resource).and_return(@r1)
|
247
|
+
allow(@r1).to receive(:is_a?).with(Puppet::Resource).and_return(true)
|
248
|
+
|
249
|
+
@r2 = double(
|
250
|
+
'r2',
|
251
|
+
:ref => "File[/b]",
|
252
|
+
:[] => nil,
|
253
|
+
:virtual => nil,
|
254
|
+
:catalog= => nil,
|
255
|
+
)
|
256
|
+
allow(@r2).to receive(:respond_to?)
|
257
|
+
allow(@r2).to receive(:respond_to?).with(:ref).and_return(true)
|
258
|
+
allow(@r2).to receive(:copy_as_resource).and_return(@r2)
|
259
|
+
allow(@r2).to receive(:is_a?).with(Puppet::Resource).and_return(true)
|
247
260
|
|
248
261
|
@resources = [@r1,@r2]
|
249
262
|
|
@@ -251,13 +264,13 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
251
264
|
end
|
252
265
|
|
253
266
|
it "should transform the catalog to a resource catalog" do
|
254
|
-
@original.
|
267
|
+
expect(@original).to receive(:to_catalog).with(:to_resource)
|
255
268
|
|
256
269
|
@original.filter
|
257
270
|
end
|
258
271
|
|
259
272
|
it "should scan each catalog resource in turn and apply filtering block" do
|
260
|
-
@resources.each { |r| r.
|
273
|
+
@resources.each { |r| expect(r).to receive(:test?) }
|
261
274
|
@original.filter do |r|
|
262
275
|
r.test?
|
263
276
|
end
|
@@ -321,7 +334,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
321
334
|
end
|
322
335
|
|
323
336
|
it "should set itself as the resource's catalog if it is not a relationship graph" do
|
324
|
-
@one.
|
337
|
+
expect(@one).to receive(:catalog=).with(@catalog)
|
325
338
|
@catalog.add_resource @one
|
326
339
|
end
|
327
340
|
|
@@ -411,14 +424,14 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
411
424
|
it "should remove all resources when asked" do
|
412
425
|
@catalog.add_resource @one
|
413
426
|
@catalog.add_resource @two
|
414
|
-
@one.
|
415
|
-
@two.
|
427
|
+
expect(@one).to receive(:remove)
|
428
|
+
expect(@two).to receive(:remove)
|
416
429
|
@catalog.clear(true)
|
417
430
|
end
|
418
431
|
|
419
432
|
it "should support a mechanism for finishing resources" do
|
420
|
-
@one.
|
421
|
-
@two.
|
433
|
+
expect(@one).to receive(:finish)
|
434
|
+
expect(@two).to receive(:finish)
|
422
435
|
@catalog.add_resource @one
|
423
436
|
@catalog.add_resource @two
|
424
437
|
|
@@ -426,7 +439,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
426
439
|
end
|
427
440
|
|
428
441
|
it "should make default resources when finalizing" do
|
429
|
-
@catalog.
|
442
|
+
expect(@catalog).to receive(:make_default_resources)
|
430
443
|
@catalog.finalize
|
431
444
|
end
|
432
445
|
|
@@ -436,8 +449,8 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
436
449
|
end
|
437
450
|
|
438
451
|
it "should optionally support an initialization block and should finalize after such blocks" do
|
439
|
-
@one.
|
440
|
-
@two.
|
452
|
+
expect(@one).to receive(:finish)
|
453
|
+
expect(@two).to receive(:finish)
|
441
454
|
Puppet::Resource::Catalog.new("host") do |conf|
|
442
455
|
conf.add_resource @one
|
443
456
|
conf.add_resource @two
|
@@ -445,7 +458,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
445
458
|
end
|
446
459
|
|
447
460
|
it "should inform the resource that it is the resource's catalog" do
|
448
|
-
@one.
|
461
|
+
expect(@one).to receive(:catalog=).with(@catalog)
|
449
462
|
@catalog.add_resource @one
|
450
463
|
end
|
451
464
|
|
@@ -528,14 +541,14 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
528
541
|
it "should remove resource aliases when the target resource is removed" do
|
529
542
|
@catalog.add_resource @one
|
530
543
|
@catalog.alias(@one, "other")
|
531
|
-
@one.
|
544
|
+
expect(@one).to receive(:remove)
|
532
545
|
@catalog.remove_resource(@one)
|
533
546
|
expect(@catalog.resource("notify", "other")).to be_nil
|
534
547
|
end
|
535
548
|
|
536
549
|
it "should add an alias for the namevar when the title and name differ on isomorphic resource types" do
|
537
550
|
resource = Puppet::Type.type(:file).new :path => @basepath+"/something", :title => "other", :content => "blah"
|
538
|
-
resource.
|
551
|
+
expect(resource).to receive(:isomorphic?).and_return(true)
|
539
552
|
@catalog.add_resource(resource)
|
540
553
|
expect(@catalog.resource(:file, "other")).to equal(resource)
|
541
554
|
expect(@catalog.resource(:file, @basepath+"/something").ref).to eq(resource.ref)
|
@@ -543,7 +556,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
543
556
|
|
544
557
|
it "should not add an alias for the namevar when the title and name differ on non-isomorphic resource types" do
|
545
558
|
resource = Puppet::Type.type(:file).new :path => @basepath+"/something", :title => "other", :content => "blah"
|
546
|
-
resource.
|
559
|
+
expect(resource).to receive(:isomorphic?).and_return(false)
|
547
560
|
@catalog.add_resource(resource)
|
548
561
|
expect(@catalog.resource(:file, resource.title)).to equal(resource)
|
549
562
|
# We can't use .should here, because the resources respond to that method.
|
@@ -552,8 +565,8 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
552
565
|
|
553
566
|
it "should provide a method to create additional resources that also registers the resource" do
|
554
567
|
args = {:name => "/yay", :ensure => :file}
|
555
|
-
resource =
|
556
|
-
Puppet::Type.type(:file).
|
568
|
+
resource = double('file', :ref => "File[/yay]", :catalog= => @catalog, :title => "/yay", :[] => "/yay")
|
569
|
+
expect(Puppet::Type.type(:file)).to receive(:new).with(args).and_return(resource)
|
557
570
|
@catalog.create_resource :file, args
|
558
571
|
expect(@catalog.resource("File[/yay]")).to equal(resource)
|
559
572
|
end
|
@@ -617,20 +630,20 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
617
630
|
@catalog = Puppet::Resource::Catalog.new("host")
|
618
631
|
|
619
632
|
@transaction = Puppet::Transaction.new(@catalog, nil, Puppet::Graph::RandomPrioritizer.new)
|
620
|
-
Puppet::Transaction.
|
621
|
-
@transaction.
|
622
|
-
@transaction.
|
633
|
+
allow(Puppet::Transaction).to receive(:new).and_return(@transaction)
|
634
|
+
allow(@transaction).to receive(:evaluate)
|
635
|
+
allow(@transaction).to receive(:for_network_device=)
|
623
636
|
|
624
|
-
Puppet.settings.
|
637
|
+
allow(Puppet.settings).to receive(:use)
|
625
638
|
end
|
626
639
|
|
627
640
|
it "should create and evaluate a transaction" do
|
628
|
-
@transaction.
|
641
|
+
expect(@transaction).to receive(:evaluate)
|
629
642
|
@catalog.apply
|
630
643
|
end
|
631
644
|
|
632
645
|
it "should add a transaction evalution time to the report" do
|
633
|
-
@transaction.report.
|
646
|
+
expect(@transaction.report).to receive(:add_times).with(:transaction_evaluation, kind_of(Numeric))
|
634
647
|
@catalog.apply
|
635
648
|
end
|
636
649
|
|
@@ -654,17 +667,17 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
654
667
|
end
|
655
668
|
|
656
669
|
it "should pass supplied tags on to the transaction" do
|
657
|
-
@transaction.
|
670
|
+
expect(@transaction).to receive(:tags=).with(%w{one two})
|
658
671
|
@catalog.apply(:tags => %w{one two})
|
659
672
|
end
|
660
673
|
|
661
674
|
it "should set ignoreschedules on the transaction if specified in apply()" do
|
662
|
-
@transaction.
|
675
|
+
expect(@transaction).to receive(:ignoreschedules=).with(true)
|
663
676
|
@catalog.apply(:ignoreschedules => true)
|
664
677
|
end
|
665
678
|
|
666
679
|
it "should detect transaction failure and report it" do
|
667
|
-
@transaction.
|
680
|
+
allow(@transaction).to receive(:evaluate).and_raise(RuntimeError, 'transaction failed.')
|
668
681
|
report = Puppet::Transaction::Report.new('apply')
|
669
682
|
|
670
683
|
expect { @catalog.apply(:report => report) }.to raise_error(RuntimeError)
|
@@ -674,31 +687,28 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
674
687
|
end
|
675
688
|
|
676
689
|
describe "host catalogs" do
|
677
|
-
|
678
690
|
# super() doesn't work in the setup method for some reason
|
679
691
|
before do
|
680
692
|
@catalog.host_config = true
|
681
|
-
Puppet::Util::Storage.
|
693
|
+
allow(Puppet::Util::Storage).to receive(:store)
|
682
694
|
end
|
683
695
|
|
684
696
|
it "should initialize the state database before applying a catalog" do
|
685
|
-
Puppet::Util::Storage.
|
697
|
+
expect(Puppet::Util::Storage).to receive(:load)
|
686
698
|
|
687
699
|
# Short-circuit the apply, so we know we're loading before the transaction
|
688
|
-
Puppet::Transaction.
|
700
|
+
expect(Puppet::Transaction).to receive(:new).and_raise(ArgumentError)
|
689
701
|
expect { @catalog.apply }.to raise_error(ArgumentError)
|
690
702
|
end
|
691
703
|
|
692
704
|
it "should sync the state database after applying" do
|
693
|
-
Puppet::Util::Storage.
|
694
|
-
@transaction.
|
705
|
+
expect(Puppet::Util::Storage).to receive(:store)
|
706
|
+
allow(@transaction).to receive(:any_failed?).and_return(false)
|
695
707
|
@catalog.apply
|
696
708
|
end
|
697
|
-
|
698
709
|
end
|
699
710
|
|
700
711
|
describe "non-host catalogs" do
|
701
|
-
|
702
712
|
before do
|
703
713
|
@catalog.host_config = false
|
704
714
|
end
|
@@ -710,11 +720,10 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
710
720
|
end
|
711
721
|
|
712
722
|
it "should never modify the state database" do
|
713
|
-
Puppet::Util::Storage.
|
714
|
-
Puppet::Util::Storage.
|
723
|
+
expect(Puppet::Util::Storage).not_to receive(:load)
|
724
|
+
expect(Puppet::Util::Storage).not_to receive(:store)
|
715
725
|
@catalog.apply
|
716
726
|
end
|
717
|
-
|
718
727
|
end
|
719
728
|
end
|
720
729
|
|
@@ -724,7 +733,7 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
724
733
|
end
|
725
734
|
|
726
735
|
it "should get removed when the catalog is cleaned up" do
|
727
|
-
@catalog.relationship_graph.
|
736
|
+
expect(@catalog.relationship_graph).to receive(:clear)
|
728
737
|
|
729
738
|
@catalog.clear
|
730
739
|
|
@@ -740,19 +749,18 @@ describe Puppet::Resource::Catalog, "when compiling" do
|
|
740
749
|
end
|
741
750
|
|
742
751
|
it "should only write when it is a host catalog" do
|
743
|
-
Puppet::FileSystem.
|
752
|
+
expect(Puppet::FileSystem).not_to receive(:open).with(@file, 0640, "w:UTF-8")
|
744
753
|
@catalog.host_config = false
|
745
754
|
Puppet[:graph] = true
|
746
755
|
@catalog.write_graph(@name)
|
747
756
|
end
|
748
|
-
|
749
757
|
end
|
750
758
|
|
751
759
|
describe "when indirecting" do
|
752
760
|
before do
|
753
761
|
@real_indirection = Puppet::Resource::Catalog.indirection
|
754
762
|
|
755
|
-
@indirection =
|
763
|
+
@indirection = double('indirection', :name => :catalog)
|
756
764
|
end
|
757
765
|
|
758
766
|
it "should use the value of the 'catalog_terminus' setting to determine its terminus class" do
|
@@ -877,7 +885,6 @@ describe Puppet::Resource::Catalog, "when converting a resource catalog to json"
|
|
877
885
|
Puppet.pop_context
|
878
886
|
end
|
879
887
|
|
880
|
-
|
881
888
|
let(:catalog_w_regexp) { compile_to_catalog("notify {'foo': message => /[a-z]+/ }") }
|
882
889
|
|
883
890
|
it 'should generate rich value hash for parameter values that are not Data' do
|
@@ -1012,9 +1019,7 @@ describe Puppet::Resource::Catalog, "when converting a resource catalog to json"
|
|
1012
1019
|
expect(message['a']).to eql(nil)
|
1013
1020
|
expect(message['b']).to eql(10)
|
1014
1021
|
end
|
1015
|
-
|
1016
1022
|
end
|
1017
|
-
|
1018
1023
|
end
|
1019
1024
|
end
|
1020
1025
|
|
@@ -1045,30 +1050,29 @@ describe Puppet::Resource::Catalog, "when converting to json" do
|
|
1045
1050
|
end
|
1046
1051
|
|
1047
1052
|
it "should convert its resources to a JSON-encoded array and store it as the 'resources' data" do
|
1048
|
-
one =
|
1049
|
-
two =
|
1053
|
+
one = double('one', :to_data_hash => "one_resource", :ref => "Foo[one]")
|
1054
|
+
two = double('two', :to_data_hash => "two_resource", :ref => "Foo[two]")
|
1050
1055
|
|
1051
|
-
one.
|
1052
|
-
two.
|
1056
|
+
expect(one).to receive(:'[]').with(:alias).and_return(nil)
|
1057
|
+
expect(two).to receive(:'[]').with(:alias).and_return(nil)
|
1053
1058
|
|
1054
1059
|
@catalog.add_resource(one)
|
1055
1060
|
@catalog.add_resource(two)
|
1056
1061
|
|
1057
1062
|
# TODO this should really guarantee sort order
|
1058
1063
|
expect(JSON.parse(@catalog.to_json,:create_additions => false)['resources'].sort).to eq(["one_resource", "two_resource"].sort)
|
1059
|
-
|
1060
1064
|
end
|
1061
1065
|
|
1062
1066
|
it "should convert its edges to a JSON-encoded array and store it as the 'edges' data" do
|
1063
|
-
one =
|
1064
|
-
two =
|
1065
|
-
three =
|
1067
|
+
one = double('one', :to_data_hash => "one_resource", :ref => 'Foo[one]')
|
1068
|
+
two = double('two', :to_data_hash => "two_resource", :ref => 'Foo[two]')
|
1069
|
+
three = double('three', :to_data_hash => "three_resource", :ref => 'Foo[three]')
|
1066
1070
|
|
1067
1071
|
@catalog.add_edge(one, two)
|
1068
1072
|
@catalog.add_edge(two, three)
|
1069
1073
|
|
1070
|
-
@catalog.edges_between(one, two )[0].
|
1071
|
-
@catalog.edges_between(two, three)[0].
|
1074
|
+
expect(@catalog.edges_between(one, two )[0]).to receive(:to_data_hash).and_return("one_two_json")
|
1075
|
+
expect(@catalog.edges_between(two, three)[0]).to receive(:to_data_hash).and_return("two_three_json")
|
1072
1076
|
|
1073
1077
|
expect(JSON.parse(@catalog.to_json,:create_additions => false)['edges'].sort).to eq(%w{one_two_json two_three_json}.sort)
|
1074
1078
|
end
|