puppet 6.4.0-universal-darwin → 6.4.1-universal-darwin

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.

Files changed (646) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +7 -11
  4. data/lib/puppet/application/device.rb +97 -82
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/application/ssl.rb +2 -2
  7. data/lib/puppet/configurer.rb +5 -4
  8. data/lib/puppet/defaults.rb +33 -11
  9. data/lib/puppet/indirector/request.rb +28 -15
  10. data/lib/puppet/ssl.rb +1 -1
  11. data/lib/puppet/ssl/certificate.rb +1 -1
  12. data/lib/puppet/ssl/error.rb +1 -1
  13. data/lib/puppet/ssl/host.rb +0 -47
  14. data/lib/puppet/ssl/ssl_provider.rb +2 -2
  15. data/lib/puppet/ssl/state_machine.rb +16 -17
  16. data/lib/puppet/ssl/validator/default_validator.rb +4 -4
  17. data/lib/puppet/ssl/verifier.rb +1 -1
  18. data/lib/puppet/transaction/event_manager.rb +1 -5
  19. data/lib/puppet/util/connection.rb +15 -8
  20. data/lib/puppet/util/monkey_patches.rb +20 -1
  21. data/lib/puppet/version.rb +1 -1
  22. data/locales/puppet.pot +135 -68
  23. data/man/man5/puppet.conf.5 +9 -9
  24. data/man/man8/puppet-agent.8 +1 -1
  25. data/man/man8/puppet-apply.8 +1 -1
  26. data/man/man8/puppet-catalog.8 +1 -1
  27. data/man/man8/puppet-config.8 +1 -1
  28. data/man/man8/puppet-describe.8 +1 -1
  29. data/man/man8/puppet-device.8 +1 -1
  30. data/man/man8/puppet-doc.8 +1 -1
  31. data/man/man8/puppet-epp.8 +1 -1
  32. data/man/man8/puppet-facts.8 +1 -1
  33. data/man/man8/puppet-filebucket.8 +1 -1
  34. data/man/man8/puppet-generate.8 +1 -1
  35. data/man/man8/puppet-help.8 +1 -1
  36. data/man/man8/puppet-key.8 +1 -1
  37. data/man/man8/puppet-lookup.8 +1 -1
  38. data/man/man8/puppet-man.8 +1 -1
  39. data/man/man8/puppet-module.8 +1 -1
  40. data/man/man8/puppet-node.8 +1 -1
  41. data/man/man8/puppet-parser.8 +1 -1
  42. data/man/man8/puppet-plugin.8 +1 -1
  43. data/man/man8/puppet-report.8 +1 -1
  44. data/man/man8/puppet-resource.8 +1 -1
  45. data/man/man8/puppet-script.8 +1 -1
  46. data/man/man8/puppet-ssl.8 +1 -1
  47. data/man/man8/puppet-status.8 +1 -1
  48. data/man/man8/puppet.8 +2 -2
  49. data/spec/integration/agent/logging_spec.rb +5 -7
  50. data/spec/integration/application/apply_spec.rb +18 -16
  51. data/spec/integration/application/doc_spec.rb +1 -2
  52. data/spec/integration/application/lookup_spec.rb +5 -5
  53. data/spec/integration/configurer_spec.rb +5 -6
  54. data/spec/integration/defaults_spec.rb +5 -6
  55. data/spec/integration/directory_environments_spec.rb +1 -1
  56. data/spec/integration/faces/config_spec.rb +3 -4
  57. data/spec/integration/faces/documentation_spec.rb +0 -1
  58. data/spec/integration/faces/plugin_spec.rb +1 -1
  59. data/spec/integration/file_bucket/file_spec.rb +2 -4
  60. data/spec/integration/file_serving/content_spec.rb +0 -1
  61. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  62. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  63. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  64. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  65. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  66. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  67. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  68. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  69. data/spec/integration/network/authconfig_spec.rb +23 -24
  70. data/spec/integration/network/formats_spec.rb +0 -1
  71. data/spec/integration/network/http_pool_spec.rb +3 -3
  72. data/spec/integration/node/environment_spec.rb +0 -1
  73. data/spec/integration/node/facts_spec.rb +9 -10
  74. data/spec/integration/node_spec.rb +6 -7
  75. data/spec/integration/parser/catalog_spec.rb +1 -5
  76. data/spec/integration/parser/collection_spec.rb +1 -2
  77. data/spec/integration/parser/compiler_spec.rb +6 -6
  78. data/spec/integration/parser/scope_spec.rb +1 -1
  79. data/spec/integration/parser/undef_param_spec.rb +1 -1
  80. data/spec/integration/provider/service/init_spec.rb +4 -5
  81. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  82. data/spec/integration/provider/service/windows_spec.rb +1 -2
  83. data/spec/integration/reference/providers_spec.rb +1 -2
  84. data/spec/integration/reports_spec.rb +1 -2
  85. data/spec/integration/resource/catalog_spec.rb +14 -17
  86. data/spec/integration/resource/type_collection_spec.rb +4 -5
  87. data/spec/integration/rest/client_spec.rb +1 -1
  88. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  89. data/spec/integration/ssl/host_spec.rb +1 -2
  90. data/spec/integration/ssl/key_spec.rb +0 -1
  91. data/spec/integration/test/test_helper_spec.rb +0 -1
  92. data/spec/integration/transaction/report_spec.rb +6 -11
  93. data/spec/integration/transaction_spec.rb +18 -19
  94. data/spec/integration/type/exec_spec.rb +0 -1
  95. data/spec/integration/type/file_spec.rb +13 -14
  96. data/spec/integration/type/package_spec.rb +19 -23
  97. data/spec/integration/type/tidy_spec.rb +1 -2
  98. data/spec/integration/type_spec.rb +0 -1
  99. data/spec/integration/util/autoload_spec.rb +1 -2
  100. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  101. data/spec/integration/util/settings_spec.rb +0 -1
  102. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  103. data/spec/integration/util/windows/principal_spec.rb +0 -1
  104. data/spec/integration/util/windows/process_spec.rb +4 -6
  105. data/spec/integration/util/windows/registry_spec.rb +41 -51
  106. data/spec/integration/util/windows/security_spec.rb +2 -4
  107. data/spec/integration/util/windows/user_spec.rb +18 -20
  108. data/spec/integration/util_spec.rb +4 -7
  109. data/spec/lib/puppet_spec/compiler.rb +1 -1
  110. data/spec/lib/puppet_spec/files.rb +0 -1
  111. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  112. data/spec/lib/puppet_spec/scope.rb +1 -2
  113. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  114. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  115. data/spec/shared_behaviours/file_serving.rb +6 -8
  116. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  117. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  118. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  119. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  120. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  121. data/spec/spec_helper.rb +10 -1
  122. data/spec/unit/agent/disabler_spec.rb +4 -5
  123. data/spec/unit/agent/locker_spec.rb +12 -13
  124. data/spec/unit/agent_spec.rb +80 -85
  125. data/spec/unit/application/agent_spec.rb +88 -94
  126. data/spec/unit/application/apply_spec.rb +82 -83
  127. data/spec/unit/application/config_spec.rb +0 -1
  128. data/spec/unit/application/describe_spec.rb +6 -7
  129. data/spec/unit/application/device_spec.rb +379 -384
  130. data/spec/unit/application/doc_spec.rb +44 -46
  131. data/spec/unit/application/face_base_spec.rb +61 -62
  132. data/spec/unit/application/facts_spec.rb +3 -4
  133. data/spec/unit/application/filebucket_spec.rb +66 -74
  134. data/spec/unit/application/indirection_base_spec.rb +8 -6
  135. data/spec/unit/application/lookup_spec.rb +26 -26
  136. data/spec/unit/application/resource_spec.rb +42 -48
  137. data/spec/unit/application/ssl_spec.rb +9 -9
  138. data/spec/unit/application_spec.rb +82 -92
  139. data/spec/unit/capability_spec.rb +6 -6
  140. data/spec/unit/certificate_factory_spec.rb +3 -5
  141. data/spec/unit/configurer/downloader_spec.rb +20 -21
  142. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  143. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  144. data/spec/unit/configurer_spec.rb +189 -192
  145. data/spec/unit/confine/exists_spec.rb +17 -15
  146. data/spec/unit/confine/false_spec.rb +5 -6
  147. data/spec/unit/confine/feature_spec.rb +7 -5
  148. data/spec/unit/confine/true_spec.rb +5 -6
  149. data/spec/unit/confine/variable_spec.rb +14 -15
  150. data/spec/unit/confine_collection_spec.rb +28 -29
  151. data/spec/unit/confine_spec.rb +13 -14
  152. data/spec/unit/confiner_spec.rb +10 -11
  153. data/spec/unit/context/trusted_information_spec.rb +1 -1
  154. data/spec/unit/daemon_spec.rb +35 -36
  155. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  156. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  157. data/spec/unit/datatypes_spec.rb +3 -4
  158. data/spec/unit/defaults_spec.rb +18 -13
  159. data/spec/unit/environments_spec.rb +7 -7
  160. data/spec/unit/etc_spec.rb +30 -32
  161. data/spec/unit/external/pson_spec.rb +0 -1
  162. data/spec/unit/face/catalog_spec.rb +0 -1
  163. data/spec/unit/face/config_spec.rb +31 -35
  164. data/spec/unit/face/epp_face_spec.rb +3 -4
  165. data/spec/unit/face/facts_spec.rb +5 -6
  166. data/spec/unit/face/generate_spec.rb +4 -5
  167. data/spec/unit/face/help_spec.rb +7 -8
  168. data/spec/unit/face/key_spec.rb +0 -1
  169. data/spec/unit/face/man_spec.rb +1 -2
  170. data/spec/unit/face/module/install_spec.rb +3 -5
  171. data/spec/unit/face/module/list_spec.rb +2 -12
  172. data/spec/unit/face/module/search_spec.rb +11 -9
  173. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  174. data/spec/unit/face/node_spec.rb +23 -24
  175. data/spec/unit/face/parser_spec.rb +3 -3
  176. data/spec/unit/face/plugin_spec.rb +36 -9
  177. data/spec/unit/face/status_spec.rb +0 -1
  178. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  179. data/spec/unit/file_bucket/file_spec.rb +0 -2
  180. data/spec/unit/file_serving/base_spec.rb +14 -15
  181. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  182. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  183. data/spec/unit/file_serving/content_spec.rb +10 -11
  184. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  185. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  186. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  187. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  188. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  189. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  190. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  191. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  192. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  193. data/spec/unit/file_serving/mount_spec.rb +0 -1
  194. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  195. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  196. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  197. data/spec/unit/file_system_spec.rb +4 -4
  198. data/spec/unit/forge/errors_spec.rb +1 -1
  199. data/spec/unit/forge/forge_spec.rb +13 -14
  200. data/spec/unit/forge/module_release_spec.rb +18 -18
  201. data/spec/unit/forge/repository_spec.rb +29 -30
  202. data/spec/unit/forge_spec.rb +15 -11
  203. data/spec/unit/functions/binary_file_spec.rb +3 -3
  204. data/spec/unit/functions/contain_spec.rb +0 -2
  205. data/spec/unit/functions/defined_spec.rb +0 -1
  206. data/spec/unit/functions/epp_spec.rb +2 -2
  207. data/spec/unit/functions/find_file_spec.rb +7 -7
  208. data/spec/unit/functions/include_spec.rb +0 -4
  209. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  210. data/spec/unit/functions/lookup_spec.rb +1 -2
  211. data/spec/unit/functions/module_directory_spec.rb +12 -12
  212. data/spec/unit/functions/require_spec.rb +0 -3
  213. data/spec/unit/functions/shared.rb +5 -8
  214. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  215. data/spec/unit/functions4_spec.rb +9 -10
  216. data/spec/unit/gettext/config_spec.rb +4 -4
  217. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  218. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  219. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  220. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  221. data/spec/unit/hiera_puppet_spec.rb +20 -20
  222. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  223. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  224. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  225. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  226. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  227. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  228. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  229. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  230. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  231. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  232. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  233. data/spec/unit/indirector/envelope_spec.rb +1 -2
  234. data/spec/unit/indirector/exec_spec.rb +4 -5
  235. data/spec/unit/indirector/face_spec.rb +9 -9
  236. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  237. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  238. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  239. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  240. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  241. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  242. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  243. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  244. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  245. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  246. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  247. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  248. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  249. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  250. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  251. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  252. data/spec/unit/indirector/file_server_spec.rb +87 -87
  253. data/spec/unit/indirector/indirection_spec.rb +242 -226
  254. data/spec/unit/indirector/json_spec.rb +7 -9
  255. data/spec/unit/indirector/key/file_spec.rb +21 -22
  256. data/spec/unit/indirector/memory_spec.rb +6 -7
  257. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  258. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  259. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  260. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  261. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  262. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  263. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  264. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  265. data/spec/unit/indirector/none_spec.rb +5 -5
  266. data/spec/unit/indirector/plain_spec.rb +7 -8
  267. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  268. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  269. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  270. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  271. data/spec/unit/indirector/request_spec.rb +11 -12
  272. data/spec/unit/indirector/resource/ral_spec.rb +47 -54
  273. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  274. data/spec/unit/indirector/rest_spec.rb +113 -110
  275. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  276. data/spec/unit/indirector/status/local_spec.rb +0 -1
  277. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  278. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  279. data/spec/unit/indirector/terminus_spec.rb +27 -27
  280. data/spec/unit/indirector/yaml_spec.rb +5 -6
  281. data/spec/unit/indirector_spec.rb +1 -2
  282. data/spec/unit/info_service_spec.rb +1 -1
  283. data/spec/unit/interface/action_builder_spec.rb +0 -1
  284. data/spec/unit/interface/action_manager_spec.rb +0 -1
  285. data/spec/unit/interface/action_spec.rb +2 -3
  286. data/spec/unit/interface/documentation_spec.rb +0 -1
  287. data/spec/unit/interface/face_collection_spec.rb +19 -12
  288. data/spec/unit/interface_spec.rb +3 -3
  289. data/spec/unit/man_spec.rb +3 -4
  290. data/spec/unit/module_spec.rb +46 -51
  291. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  292. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  293. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  294. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  295. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  296. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  297. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  298. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  299. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  300. data/spec/unit/module_tool/tar_spec.rb +12 -13
  301. data/spec/unit/module_tool_spec.rb +7 -12
  302. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  303. data/spec/unit/network/authconfig_spec.rb +17 -18
  304. data/spec/unit/network/authorization_spec.rb +4 -5
  305. data/spec/unit/network/authstore_spec.rb +0 -1
  306. data/spec/unit/network/format_handler_spec.rb +0 -1
  307. data/spec/unit/network/format_spec.rb +9 -10
  308. data/spec/unit/network/format_support_spec.rb +28 -29
  309. data/spec/unit/network/formats_spec.rb +4 -5
  310. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  311. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  312. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  313. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  314. data/spec/unit/network/http/api_spec.rb +0 -2
  315. data/spec/unit/network/http/compression_spec.rb +21 -22
  316. data/spec/unit/network/http/connection_spec.rb +35 -35
  317. data/spec/unit/network/http/factory_spec.rb +5 -6
  318. data/spec/unit/network/http/handler_spec.rb +9 -18
  319. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  320. data/spec/unit/network/http/pool_spec.rb +33 -34
  321. data/spec/unit/network/http/request_spec.rb +0 -2
  322. data/spec/unit/network/http/response_spec.rb +11 -13
  323. data/spec/unit/network/http/route_spec.rb +0 -1
  324. data/spec/unit/network/http/session_spec.rb +2 -3
  325. data/spec/unit/network/http/site_spec.rb +0 -1
  326. data/spec/unit/network/http_pool_spec.rb +19 -10
  327. data/spec/unit/network/http_spec.rb +0 -1
  328. data/spec/unit/network/resolver_spec.rb +25 -26
  329. data/spec/unit/network/rights_spec.rb +52 -53
  330. data/spec/unit/node/environment_spec.rb +14 -15
  331. data/spec/unit/node/facts_spec.rb +5 -7
  332. data/spec/unit/node_spec.rb +4 -10
  333. data/spec/unit/other/selinux_spec.rb +0 -1
  334. data/spec/unit/parameter/boolean_spec.rb +1 -2
  335. data/spec/unit/parameter/package_options_spec.rb +1 -2
  336. data/spec/unit/parameter/path_spec.rb +0 -1
  337. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  338. data/spec/unit/parameter/value_spec.rb +0 -1
  339. data/spec/unit/parameter_spec.rb +9 -9
  340. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  341. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  342. data/spec/unit/parser/compiler_spec.rb +84 -96
  343. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  344. data/spec/unit/parser/files_spec.rb +0 -1
  345. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  346. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  347. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  348. data/spec/unit/parser/functions/file_spec.rb +13 -14
  349. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  350. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  351. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  352. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  353. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  354. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  355. data/spec/unit/parser/functions/split_spec.rb +0 -1
  356. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  357. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  358. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  359. data/spec/unit/parser/functions/template_spec.rb +13 -13
  360. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  361. data/spec/unit/parser/functions_spec.rb +6 -7
  362. data/spec/unit/parser/relationship_spec.rb +0 -1
  363. data/spec/unit/parser/resource_spec.rb +42 -42
  364. data/spec/unit/parser/scope_spec.rb +39 -35
  365. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  366. data/spec/unit/parser/type_loader_spec.rb +17 -19
  367. data/spec/unit/pops/adaptable_spec.rb +0 -1
  368. data/spec/unit/pops/benchmark_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  371. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  372. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  373. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  374. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  375. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  376. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  377. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  378. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  379. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  380. data/spec/unit/pops/factory_spec.rb +3 -4
  381. data/spec/unit/pops/issues_spec.rb +19 -20
  382. data/spec/unit/pops/loaders/loader_spec.rb +9 -5
  383. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  384. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  385. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  386. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  387. data/spec/unit/pops/migration_spec.rb +3 -5
  388. data/spec/unit/pops/model/model_spec.rb +0 -1
  389. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  390. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  391. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  392. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  393. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  394. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  395. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  396. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  397. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  398. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  399. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  400. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  401. data/spec/unit/pops/pn_spec.rb +0 -1
  402. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  403. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  404. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  405. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  406. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  407. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  408. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  409. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  410. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  411. data/spec/unit/pops/visitor_spec.rb +0 -1
  412. data/spec/unit/property/boolean_spec.rb +1 -1
  413. data/spec/unit/property/ensure_spec.rb +0 -1
  414. data/spec/unit/property/keyvalue_spec.rb +32 -34
  415. data/spec/unit/property/list_spec.rb +26 -27
  416. data/spec/unit/property/ordered_list_spec.rb +10 -14
  417. data/spec/unit/property_spec.rb +42 -43
  418. data/spec/unit/provider/aix_object_spec.rb +47 -45
  419. data/spec/unit/provider/command_spec.rb +9 -9
  420. data/spec/unit/provider/exec/posix_spec.rb +8 -9
  421. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  422. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  423. data/spec/unit/provider/exec_spec.rb +0 -1
  424. data/spec/unit/provider/file/posix_spec.rb +22 -24
  425. data/spec/unit/provider/file/windows_spec.rb +15 -17
  426. data/spec/unit/provider/group/aix_spec.rb +3 -2
  427. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  428. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  429. data/spec/unit/provider/group/pw_spec.rb +11 -11
  430. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  431. data/spec/unit/provider/ldap_spec.rb +61 -62
  432. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  433. data/spec/unit/provider/nameservice_spec.rb +38 -40
  434. data/spec/unit/provider/package/aix_spec.rb +15 -15
  435. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  436. data/spec/unit/provider/package/apt_spec.rb +44 -27
  437. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  438. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  439. data/spec/unit/provider/package/base_spec.rb +4 -4
  440. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  441. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  442. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  443. data/spec/unit/provider/package/gem_spec.rb +51 -43
  444. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  445. data/spec/unit/provider/package/macports_spec.rb +46 -42
  446. data/spec/unit/provider/package/nim_spec.rb +30 -39
  447. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  448. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  449. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  450. data/spec/unit/provider/package/pip_spec.rb +71 -72
  451. data/spec/unit/provider/package/pkg_spec.rb +113 -114
  452. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  453. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  454. data/spec/unit/provider/package/pkgng_spec.rb +21 -22
  455. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  456. data/spec/unit/provider/package/portage_spec.rb +71 -75
  457. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  458. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  459. data/spec/unit/provider/package/sun_spec.rb +16 -18
  460. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  461. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  462. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  463. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  464. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  465. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  466. data/spec/unit/provider/package/windows_spec.rb +36 -32
  467. data/spec/unit/provider/package/yum_spec.rb +7 -7
  468. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  469. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  470. data/spec/unit/provider/service/base_spec.rb +4 -5
  471. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  472. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  473. data/spec/unit/provider/service/debian_spec.rb +38 -38
  474. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  475. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  476. data/spec/unit/provider/service/init_spec.rb +53 -52
  477. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  478. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  479. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  480. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  481. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  482. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  483. data/spec/unit/provider/service/runit_spec.rb +29 -27
  484. data/spec/unit/provider/service/smf_spec.rb +74 -66
  485. data/spec/unit/provider/service/src_spec.rb +46 -47
  486. data/spec/unit/provider/service/systemd_spec.rb +113 -122
  487. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  488. data/spec/unit/provider/service/windows_spec.rb +33 -41
  489. data/spec/unit/provider/user/aix_spec.rb +31 -31
  490. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  491. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  492. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  493. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  494. data/spec/unit/provider/user/pw_spec.rb +37 -35
  495. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  496. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  497. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  498. data/spec/unit/provider_spec.rb +35 -35
  499. data/spec/unit/puppet_pal_2pec.rb +4 -5
  500. data/spec/unit/puppet_pal_spec.rb +0 -1
  501. data/spec/unit/puppet_spec.rb +6 -7
  502. data/spec/unit/relationship_spec.rb +0 -1
  503. data/spec/unit/reports/http_spec.rb +22 -24
  504. data/spec/unit/reports/store_spec.rb +3 -4
  505. data/spec/unit/reports_spec.rb +12 -14
  506. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  507. data/spec/unit/resource/catalog_spec.rb +72 -68
  508. data/spec/unit/resource/status_spec.rb +6 -8
  509. data/spec/unit/resource/type_collection_spec.rb +17 -18
  510. data/spec/unit/resource/type_spec.rb +34 -35
  511. data/spec/unit/resource_spec.rb +36 -32
  512. data/spec/unit/rest/client_spec.rb +56 -25
  513. data/spec/unit/rest/route_spec.rb +5 -5
  514. data/spec/unit/scheduler/job_spec.rb +0 -1
  515. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  516. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  517. data/spec/unit/settings/array_setting_spec.rb +1 -1
  518. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  519. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  520. data/spec/unit/settings/config_file_spec.rb +0 -1
  521. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  522. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  523. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  524. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  525. data/spec/unit/settings/file_setting_spec.rb +44 -46
  526. data/spec/unit/settings/path_setting_spec.rb +1 -2
  527. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  528. data/spec/unit/settings/string_setting_spec.rb +14 -15
  529. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  530. data/spec/unit/settings/value_translator_spec.rb +0 -1
  531. data/spec/unit/settings_spec.rb +228 -235
  532. data/spec/unit/ssl/base_spec.rb +14 -15
  533. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  534. data/spec/unit/ssl/certificate_spec.rb +23 -25
  535. data/spec/unit/ssl/digest_spec.rb +0 -1
  536. data/spec/unit/ssl/host_spec.rb +147 -130
  537. data/spec/unit/ssl/key_spec.rb +30 -31
  538. data/spec/unit/ssl/ssl_provider_spec.rb +24 -24
  539. data/spec/unit/ssl/state_machine_spec.rb +50 -58
  540. data/spec/unit/ssl/validator_spec.rb +43 -54
  541. data/spec/unit/ssl/verifier_spec.rb +10 -10
  542. data/spec/unit/task_spec.rb +44 -45
  543. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  544. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  545. data/spec/unit/transaction/event_spec.rb +16 -15
  546. data/spec/unit/transaction/persistence_spec.rb +16 -17
  547. data/spec/unit/transaction/report_spec.rb +11 -12
  548. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  549. data/spec/unit/transaction_spec.rb +100 -101
  550. data/spec/unit/type/component_spec.rb +0 -1
  551. data/spec/unit/type/exec_spec.rb +60 -56
  552. data/spec/unit/type/file/checksum_spec.rb +9 -10
  553. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  554. data/spec/unit/type/file/content_spec.rb +58 -61
  555. data/spec/unit/type/file/ctime_spec.rb +0 -1
  556. data/spec/unit/type/file/ensure_spec.rb +12 -13
  557. data/spec/unit/type/file/group_spec.rb +5 -7
  558. data/spec/unit/type/file/mode_spec.rb +4 -6
  559. data/spec/unit/type/file/mtime_spec.rb +0 -1
  560. data/spec/unit/type/file/owner_spec.rb +6 -8
  561. data/spec/unit/type/file/selinux_spec.rb +17 -19
  562. data/spec/unit/type/file/source_spec.rb +104 -101
  563. data/spec/unit/type/file/type_spec.rb +0 -1
  564. data/spec/unit/type/file_spec.rb +195 -185
  565. data/spec/unit/type/filebucket_spec.rb +4 -5
  566. data/spec/unit/type/group_spec.rb +6 -8
  567. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  568. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  569. data/spec/unit/type/package_spec.rb +56 -57
  570. data/spec/unit/type/resources_spec.rb +72 -74
  571. data/spec/unit/type/schedule_spec.rb +24 -26
  572. data/spec/unit/type/service_spec.rb +49 -49
  573. data/spec/unit/type/stage_spec.rb +0 -1
  574. data/spec/unit/type/tidy_spec.rb +61 -62
  575. data/spec/unit/type/user_spec.rb +24 -25
  576. data/spec/unit/type/whit_spec.rb +0 -1
  577. data/spec/unit/type_spec.rb +55 -54
  578. data/spec/unit/util/at_fork_spec.rb +18 -19
  579. data/spec/unit/util/autoload_spec.rb +55 -56
  580. data/spec/unit/util/backups_spec.rb +34 -35
  581. data/spec/unit/util/character_encoding_spec.rb +5 -5
  582. data/spec/unit/util/checksums_spec.rb +38 -39
  583. data/spec/unit/util/colors_spec.rb +1 -2
  584. data/spec/unit/util/command_line_spec.rb +24 -25
  585. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  586. data/spec/unit/util/diff_spec.rb +7 -8
  587. data/spec/unit/util/errors_spec.rb +0 -1
  588. data/spec/unit/util/execution_spec.rb +185 -161
  589. data/spec/unit/util/execution_stub_spec.rb +0 -1
  590. data/spec/unit/util/feature_spec.rb +23 -14
  591. data/spec/unit/util/filetype_spec.rb +49 -49
  592. data/spec/unit/util/http_proxy_spec.rb +12 -12
  593. data/spec/unit/util/inifile_spec.rb +26 -31
  594. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  595. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  596. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  597. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  598. data/spec/unit/util/lockfile_spec.rb +0 -1
  599. data/spec/unit/util/log/destinations_spec.rb +30 -33
  600. data/spec/unit/util/log_spec.rb +35 -36
  601. data/spec/unit/util/logging_spec.rb +58 -72
  602. data/spec/unit/util/metric_spec.rb +0 -1
  603. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  604. data/spec/unit/util/multi_match_spec.rb +0 -1
  605. data/spec/unit/util/network_device/config_spec.rb +0 -1
  606. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  607. data/spec/unit/util/network_device_spec.rb +7 -9
  608. data/spec/unit/util/package_spec.rb +0 -1
  609. data/spec/unit/util/pidlock_spec.rb +21 -22
  610. data/spec/unit/util/plist_spec.rb +40 -33
  611. data/spec/unit/util/posix_spec.rb +54 -51
  612. data/spec/unit/util/rdoc_spec.rb +9 -10
  613. data/spec/unit/util/reference_spec.rb +0 -1
  614. data/spec/unit/util/resource_template_spec.rb +20 -20
  615. data/spec/unit/util/retry_action_spec.rb +7 -8
  616. data/spec/unit/util/rubygems_spec.rb +7 -8
  617. data/spec/unit/util/run_mode_spec.rb +3 -4
  618. data/spec/unit/util/selinux_spec.rb +79 -72
  619. data/spec/unit/util/splayer_spec.rb +8 -9
  620. data/spec/unit/util/ssl_spec.rb +0 -1
  621. data/spec/unit/util/storage_spec.rb +3 -4
  622. data/spec/unit/util/suidmanager_spec.rb +45 -54
  623. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  624. data/spec/unit/util/tag_set_spec.rb +0 -1
  625. data/spec/unit/util/tagging_spec.rb +0 -1
  626. data/spec/unit/util/terminal_spec.rb +9 -10
  627. data/spec/unit/util/user_attr_spec.rb +1 -2
  628. data/spec/unit/util/warnings_spec.rb +3 -4
  629. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  630. data/spec/unit/util/watcher_spec.rb +51 -21
  631. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  632. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  633. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  634. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  635. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  636. data/spec/unit/util/windows/file_spec.rb +0 -1
  637. data/spec/unit/util/windows/root_certs_spec.rb +1 -2
  638. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  639. data/spec/unit/util/windows/service_spec.rb +66 -68
  640. data/spec/unit/util/windows/sid_spec.rb +11 -13
  641. data/spec/unit/util/windows/string_spec.rb +0 -1
  642. data/spec/unit/util_spec.rb +55 -57
  643. data/spec/unit/version_spec.rb +6 -6
  644. data/spec/unit/x509/cert_provider_spec.rb +14 -14
  645. data/spec/unit/x509/pem_store_spec.rb +5 -5
  646. metadata +2 -2
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
 
4
3
  require 'puppet/confiner'
@@ -22,15 +21,15 @@ describe Puppet::Confiner do
22
21
  end
23
22
 
24
23
  it "should delegate its confine method to its confine collection" do
25
- coll = mock 'collection'
26
- @object.stubs(:confine_collection).returns coll
27
- coll.expects(:confine).with(:foo => :bar, :bee => :baz)
24
+ coll = double('collection')
25
+ allow(@object).to receive(:confine_collection).and_return(coll)
26
+ expect(coll).to receive(:confine).with(:foo => :bar, :bee => :baz)
28
27
  @object.confine(:foo => :bar, :bee => :baz)
29
28
  end
30
29
 
31
30
  it "should create a new confine collection if one does not exist" do
32
- Puppet::ConfineCollection.expects(:new).with("mylabel").returns "mycoll"
33
- @object.expects(:to_s).returns "mylabel"
31
+ expect(Puppet::ConfineCollection).to receive(:new).with("mylabel").and_return("mycoll")
32
+ expect(@object).to receive(:to_s).and_return("mylabel")
34
33
  expect(@object.confine_collection).to eq("mycoll")
35
34
  end
36
35
 
@@ -40,22 +39,22 @@ describe Puppet::Confiner do
40
39
 
41
40
  describe "when testing suitability" do
42
41
  before do
43
- @coll = mock 'collection'
44
- @object.stubs(:confine_collection).returns @coll
42
+ @coll = double('collection')
43
+ allow(@object).to receive(:confine_collection).and_return(@coll)
45
44
  end
46
45
 
47
46
  it "should return true if the confine collection is valid" do
48
- @coll.expects(:valid?).returns true
47
+ expect(@coll).to receive(:valid?).and_return(true)
49
48
  expect(@object).to be_suitable
50
49
  end
51
50
 
52
51
  it "should return false if the confine collection is invalid" do
53
- @coll.expects(:valid?).returns false
52
+ expect(@coll).to receive(:valid?).and_return(false)
54
53
  expect(@object).not_to be_suitable
55
54
  end
56
55
 
57
56
  it "should return the summary of the confine collection if a long result is asked for" do
58
- @coll.expects(:summary).returns "myresult"
57
+ expect(@coll).to receive(:summary).and_return("myresult")
59
58
  expect(@object.suitable?(false)).to eq("myresult")
60
59
  end
61
60
  end
@@ -53,7 +53,7 @@ describe Puppet::Context::TrustedInformation, :unless => RUBY_PLATFORM == 'java'
53
53
  end
54
54
 
55
55
  it "is remote but lacks certificate information when it is authenticated" do
56
- Puppet.expects(:info).once.with("TrustedInformation expected a certificate, but none was given.")
56
+ expect(Puppet).to receive(:info).once.with("TrustedInformation expected a certificate, but none was given.")
57
57
 
58
58
  trusted = Puppet::Context::TrustedInformation.remote(true, 'cert name', nil)
59
59
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/daemon'
4
3
  require 'puppet/agent'
@@ -28,29 +27,29 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
28
27
  end
29
28
 
30
29
  let(:agent) { Puppet::Agent.new(TestClient.new, false) }
31
- let(:server) { stub("Server", :start => nil, :wait_for_shutdown => nil) }
30
+ let(:server) { double("Server", :start => nil, :wait_for_shutdown => nil) }
32
31
 
33
- let(:pidfile) { stub("PidFile", :lock => true, :unlock => true, :file_path => 'fake.pid') }
32
+ let(:pidfile) { double("PidFile", :lock => true, :unlock => true, :file_path => 'fake.pid') }
34
33
  let(:scheduler) { RecordingScheduler.new }
35
34
 
36
35
  let(:daemon) { Puppet::Daemon.new(pidfile, scheduler) }
37
36
 
38
37
  before(:each) do
39
- Signal.stubs(:trap)
40
- daemon.stubs(:close_streams).returns nil
38
+ allow(Signal).to receive(:trap)
39
+ allow(daemon).to receive(:close_streams).and_return(nil)
41
40
  end
42
41
 
43
42
  it "should reopen the Log logs when told to reopen logs" do
44
- Puppet::Util::Log.expects(:reopen)
43
+ expect(Puppet::Util::Log).to receive(:reopen)
45
44
  daemon.reopen_logs
46
45
  end
47
46
 
48
47
  describe "when setting signal traps" do
49
48
  [:INT, :TERM].each do |signal|
50
49
  it "logs a notice and exits when sent #{signal}" do
51
- Signal.stubs(:trap).with(signal).yields
52
- Puppet.expects(:notice).with("Caught #{signal}; exiting")
53
- daemon.expects(:stop)
50
+ allow(Signal).to receive(:trap).with(signal).and_yield
51
+ expect(Puppet).to receive(:notice).with("Caught #{signal}; exiting")
52
+ expect(daemon).to receive(:stop)
54
53
 
55
54
  daemon.set_signal_traps
56
55
  end
@@ -58,8 +57,8 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
58
57
 
59
58
  {:HUP => :restart, :USR1 => :reload, :USR2 => :reopen_logs}.each do |signal, method|
60
59
  it "logs a notice and remembers to call #{method} when it receives #{signal}" do
61
- Signal.stubs(:trap).with(signal).yields
62
- Puppet.expects(:notice).with("Caught #{signal}; storing #{method}")
60
+ allow(Signal).to receive(:trap).with(signal).and_yield
61
+ expect(Puppet).to receive(:notice).with("Caught #{signal}; storing #{method}")
63
62
 
64
63
  daemon.set_signal_traps
65
64
 
@@ -70,7 +69,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
70
69
 
71
70
  describe "when starting" do
72
71
  before do
73
- daemon.stubs(:set_signal_traps)
72
+ allow(daemon).to receive(:set_signal_traps)
74
73
  end
75
74
 
76
75
  it "should fail if it has neither agent nor server" do
@@ -78,14 +77,14 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
78
77
  end
79
78
 
80
79
  it "should create its pidfile" do
81
- pidfile.expects(:lock).returns(true)
80
+ expect(pidfile).to receive(:lock).and_return(true)
82
81
 
83
82
  daemon.agent = agent
84
83
  daemon.start
85
84
  end
86
85
 
87
86
  it "should fail if it cannot lock" do
88
- pidfile.expects(:lock).returns(false)
87
+ expect(pidfile).to receive(:lock).and_return(false)
89
88
  daemon.agent = agent
90
89
 
91
90
  expect { daemon.start }.to raise_error(RuntimeError, "Could not create PID file: #{pidfile.file_path}")
@@ -94,7 +93,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
94
93
  it "should start its server if one is configured" do
95
94
  daemon.server = server
96
95
 
97
- server.expects(:start)
96
+ expect(server).to receive(:start)
98
97
 
99
98
  daemon.start
100
99
  end
@@ -120,7 +119,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
120
119
  it "waits for the server to shutdown when there is one" do
121
120
  daemon.server = server
122
121
 
123
- server.expects(:wait_for_shutdown)
122
+ expect(server).to receive(:wait_for_shutdown)
124
123
 
125
124
  daemon.start
126
125
  end
@@ -128,7 +127,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
128
127
  it "waits for the server to shutdown when there is one" do
129
128
  daemon.server = server
130
129
 
131
- server.expects(:wait_for_shutdown)
130
+ expect(server).to receive(:wait_for_shutdown)
132
131
 
133
132
  daemon.start
134
133
  end
@@ -136,7 +135,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
136
135
 
137
136
  describe "when stopping" do
138
137
  before do
139
- Puppet::Util::Log.stubs(:close_all)
138
+ allow(Puppet::Util::Log).to receive(:close_all)
140
139
  # to make the global safe to mock, set it to a subclass of itself,
141
140
  # then restore it in an after pass
142
141
  without_warnings { Puppet::Application = Class.new(Puppet::Application) }
@@ -148,7 +147,7 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
148
147
  end
149
148
 
150
149
  it "should stop its server if one is configured" do
151
- server.expects(:stop)
150
+ expect(server).to receive(:stop)
152
151
 
153
152
  daemon.server = server
154
153
 
@@ -156,18 +155,18 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
156
155
  end
157
156
 
158
157
  it 'should request a stop from Puppet::Application' do
159
- Puppet::Application.expects(:stop!)
158
+ expect(Puppet::Application).to receive(:stop!)
160
159
  expect { daemon.stop }.to exit_with 0
161
160
  end
162
161
 
163
162
  it "should remove its pidfile" do
164
- pidfile.expects(:unlock)
163
+ expect(pidfile).to receive(:unlock)
165
164
 
166
165
  expect { daemon.stop }.to exit_with 0
167
166
  end
168
167
 
169
168
  it "should close all logs" do
170
- Puppet::Util::Log.expects(:close_all)
169
+ expect(Puppet::Util::Log).to receive(:close_all)
171
170
  expect { daemon.stop }.to exit_with 0
172
171
  end
173
172
 
@@ -186,8 +185,8 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
186
185
  end
187
186
 
188
187
  it "should do nothing if the agent is running" do
189
- agent.expects(:run).with({:splay => false}).raises Puppet::LockError, 'Failed to aquire lock'
190
- Puppet.expects(:notice).with('Not triggering already-running agent')
188
+ expect(agent).to receive(:run).with({:splay => false}).and_raise(Puppet::LockError, 'Failed to aquire lock')
189
+ expect(Puppet).to receive(:notice).with('Not triggering already-running agent')
191
190
 
192
191
  daemon.agent = agent
193
192
 
@@ -195,8 +194,8 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
195
194
  end
196
195
 
197
196
  it "should run the agent if one is available and it is not running" do
198
- agent.expects(:run).with({:splay => false})
199
- Puppet.expects(:notice).with('Not triggering already-running agent').never
197
+ expect(agent).to receive(:run).with({:splay => false})
198
+ expect(Puppet).not_to receive(:notice).with('Not triggering already-running agent')
200
199
 
201
200
  daemon.agent = agent
202
201
 
@@ -214,21 +213,21 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
214
213
  end
215
214
 
216
215
  it 'should set Puppet::Application.restart!' do
217
- Puppet::Application.expects(:restart!)
218
- daemon.stubs(:reexec)
216
+ expect(Puppet::Application).to receive(:restart!)
217
+ allow(daemon).to receive(:reexec)
219
218
  daemon.restart
220
219
  end
221
220
 
222
221
  it "should reexec itself if no agent is available" do
223
- daemon.expects(:reexec)
222
+ expect(daemon).to receive(:reexec)
224
223
 
225
224
  daemon.restart
226
225
  end
227
226
 
228
227
  it "should reexec itself if the agent is not running" do
229
- agent.expects(:running?).returns false
228
+ expect(agent).to receive(:running?).and_return(false)
230
229
  daemon.agent = agent
231
- daemon.expects(:reexec)
230
+ expect(daemon).to receive(:reexec)
232
231
 
233
232
  daemon.restart
234
233
  end
@@ -236,25 +235,25 @@ describe Puppet::Daemon, :unless => Puppet::Util::Platform.windows? do
236
235
 
237
236
  describe "when reexecing it self" do
238
237
  before do
239
- daemon.stubs(:exec)
240
- daemon.stubs(:stop)
238
+ allow(daemon).to receive(:exec)
239
+ allow(daemon).to receive(:stop)
241
240
  end
242
241
 
243
242
  it "should fail if no argv values are available" do
244
- daemon.expects(:argv).returns nil
243
+ expect(daemon).to receive(:argv).and_return(nil)
245
244
  expect { daemon.reexec }.to raise_error(Puppet::DevError)
246
245
  end
247
246
 
248
247
  it "should shut down without exiting" do
249
248
  daemon.argv = %w{foo}
250
- daemon.expects(:stop).with(:exit => false)
249
+ expect(daemon).to receive(:stop).with(:exit => false)
251
250
 
252
251
  daemon.reexec
253
252
  end
254
253
 
255
254
  it "should call 'exec' with the original executable and arguments" do
256
255
  daemon.argv = %w{foo}
257
- daemon.expects(:exec).with($0 + " foo")
256
+ expect(daemon).to receive(:exec).with($0 + " foo")
258
257
 
259
258
  daemon.reexec
260
259
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet_spec/compiler'
4
3
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet_spec/compiler'
4
3
 
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet_spec/compiler'
4
3
  require 'puppet_spec/files'
@@ -284,7 +283,7 @@ describe "Puppet::DataTypes" do
284
283
  'position.rb' => <<-RUBY
285
284
  module PuppetX; module Mytest; class Position
286
285
  attr_reader :x, :y
287
-
286
+
288
287
  def initialize(x, y)
289
288
  @x = x
290
289
  @y = y
@@ -311,7 +310,7 @@ describe "Puppet::DataTypes" do
311
310
  PUPPET
312
311
 
313
312
  load_file('puppetx/mytest/position')
314
-
313
+
315
314
  implementation_class PuppetX::Mytest::Position
316
315
  end
317
316
  RUBY
@@ -337,7 +336,7 @@ describe "Puppet::DataTypes" do
337
336
  PUPPET
338
337
 
339
338
  load_file('puppetx/mytest/position')
340
-
339
+
341
340
  implementation_class PuppetX::Mytest::Position
342
341
  end
343
342
  RUBY
@@ -5,16 +5,19 @@ describe "Defaults" do
5
5
  describe ".default_diffargs" do
6
6
  describe "on AIX" do
7
7
  before(:each) do
8
- Facter.stubs(:value).with(:kernel).returns("AIX")
8
+ allow(Facter).to receive(:value).with(:kernel).and_return("AIX")
9
9
  end
10
+
10
11
  describe "on 5.3" do
11
12
  before(:each) do
12
- Facter.stubs(:value).with(:kernelmajversion).returns("5300")
13
+ allow(Facter).to receive(:value).with(:kernelmajversion).and_return("5300")
13
14
  end
15
+
14
16
  it "should be empty" do
15
17
  expect(Puppet.default_diffargs).to eq("")
16
18
  end
17
19
  end
20
+
18
21
  [ "",
19
22
  nil,
20
23
  "6300",
@@ -22,7 +25,7 @@ describe "Defaults" do
22
25
  ].each do |kernel_version|
23
26
  describe "on kernel version #{kernel_version.inspect}" do
24
27
  before(:each) do
25
- Facter.stubs(:value).with(:kernelmajversion).returns(kernel_version)
28
+ allow(Facter).to receive(:value).with(:kernelmajversion).and_return(kernel_version)
26
29
  end
27
30
 
28
31
  it "should be '-u'" do
@@ -31,9 +34,10 @@ describe "Defaults" do
31
34
  end
32
35
  end
33
36
  end
37
+
34
38
  describe "on everything else" do
35
39
  before(:each) do
36
- Facter.stubs(:value).with(:kernel).returns("NOT_AIX")
40
+ allow(Facter).to receive(:value).with(:kernel).and_return("NOT_AIX")
37
41
  end
38
42
 
39
43
  it "should be '-u'" do
@@ -62,24 +66,24 @@ describe "Defaults" do
62
66
 
63
67
  describe '.default_digest_algorithm' do
64
68
  it 'defaults to md5 when FIPS is not enabled' do
65
- Puppet::Util::Platform.stubs(:fips_enabled?).returns false
69
+ allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(false)
66
70
  expect(Puppet.default_digest_algorithm).to eq('md5')
67
71
  end
68
72
 
69
73
  it 'defaults to sha256 when FIPS is enabled' do
70
- Puppet::Util::Platform.stubs(:fips_enabled?).returns true
74
+ allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(true)
71
75
  expect(Puppet.default_digest_algorithm).to eq('sha256')
72
76
  end
73
77
  end
74
78
 
75
79
  describe '.supported_checksum_types' do
76
80
  it 'defaults to md5, sha256, sha384, sha512, sha224 when FIPS is not enabled' do
77
- Puppet::Util::Platform.stubs(:fips_enabled?).returns false
81
+ allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(false)
78
82
  expect(Puppet.default_file_checksum_types).to eq(%w[md5 sha256 sha384 sha512 sha224])
79
83
  end
80
84
 
81
85
  it 'defaults to sha256, sha384, sha512, sha224 when FIPS is enabled' do
82
- Puppet::Util::Platform.stubs(:fips_enabled?).returns true
86
+ allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(true)
83
87
  expect(Puppet.default_file_checksum_types).to eq(%w[sha256 sha384 sha512 sha224])
84
88
  end
85
89
  end
@@ -102,7 +106,7 @@ describe "Defaults" do
102
106
  end
103
107
 
104
108
  it 'raises when setting md5 in FIPS mode' do
105
- Puppet::Util::Platform.stubs(:fips_enabled?).returns true
109
+ allow(Puppet::Util::Platform).to receive(:fips_enabled?).and_return(true)
106
110
  expect {
107
111
  Puppet.settings[:supported_checksum_types] = %w[md5]
108
112
  }.to raise_error(ArgumentError,
@@ -116,6 +120,7 @@ describe "Defaults" do
116
120
  expect(Puppet.settings[:manage_internal_file_permissions]).to be false
117
121
  end
118
122
  end
123
+
119
124
  describe 'on non-windows', :if => ! Puppet::Util::Platform.windows? do
120
125
  it 'should default to true' do
121
126
  expect(Puppet.settings[:manage_internal_file_permissions]).to be true
@@ -134,7 +139,7 @@ describe "Defaults" do
134
139
  let(:installdir) { 'C:\Program Files\Puppet Labs\Puppet' }
135
140
 
136
141
  it 'includes user and system modules' do
137
- Facter.stubs(:value).with(:env_windows_installdir).returns(installdir)
142
+ allow(Facter).to receive(:value).with(:env_windows_installdir).and_return(installdir)
138
143
 
139
144
  expect(
140
145
  Puppet.default_basemodulepath
@@ -142,7 +147,7 @@ describe "Defaults" do
142
147
  end
143
148
 
144
149
  it 'includes user modules if installdir fact is missing' do
145
- Facter.stubs(:value).with(:env_windows_installdir).returns(nil)
150
+ allow(Facter).to receive(:value).with(:env_windows_installdir).and_return(nil)
146
151
 
147
152
  expect(
148
153
  Puppet.default_basemodulepath
@@ -162,7 +167,7 @@ describe "Defaults" do
162
167
  let(:installdir) { 'C:\Program Files\Puppet Labs\Puppet' }
163
168
 
164
169
  it 'includes the default vendormoduledir' do
165
- Facter.stubs(:value).with(:env_windows_installdir).returns(installdir)
170
+ allow(Facter).to receive(:value).with(:env_windows_installdir).and_return(installdir)
166
171
 
167
172
  expect(
168
173
  Puppet.default_vendormoduledir
@@ -170,7 +175,7 @@ describe "Defaults" do
170
175
  end
171
176
 
172
177
  it 'is nil if installdir fact is missing' do
173
- Facter.stubs(:value).with(:env_windows_installdir).returns(nil)
178
+ allow(Facter).to receive(:value).with(:env_windows_installdir).and_return(nil)
174
179
 
175
180
  expect(Puppet.default_vendormoduledir).to be_nil
176
181
  end
@@ -266,7 +266,7 @@ config_version=relative/script
266
266
  end
267
267
 
268
268
  it "interprets glob modulepaths from the environment's directory" do
269
- Dir.stubs(:glob).with(File.join(envdir, 'env1', 'other', '*', 'modules')).returns([
269
+ allow(Dir).to receive(:glob).with(File.join(envdir, 'env1', 'other', '*', 'modules')).and_return([
270
270
  File.join(envdir, 'env1', 'other', 'foo', 'modules'),
271
271
  File.join(envdir, 'env1', 'other', 'bar', 'modules')
272
272
  ])
@@ -563,9 +563,9 @@ config_version=$vardir/random/scripts
563
563
 
564
564
  it "does not reload the environment if it isn't expired" do
565
565
  env = Puppet::Node::Environment.create(:cached, [])
566
- mocked_loader = mock('loader')
567
- mocked_loader.expects(:get).with(:cached).returns(env).once
568
- mocked_loader.expects(:get_conf).with(:cached).returns(Puppet::Settings::EnvironmentConf.static_for(env, 20)).once
566
+ mocked_loader = double('loader')
567
+ expect(mocked_loader).to receive(:get).with(:cached).and_return(env).once
568
+ expect(mocked_loader).to receive(:get_conf).with(:cached).and_return(Puppet::Settings::EnvironmentConf.static_for(env, 20)).once
569
569
 
570
570
  cached = Puppet::Environments::Cached.new(mocked_loader)
571
571
 
@@ -589,9 +589,9 @@ config_version=$vardir/random/scripts
589
589
 
590
590
  it "does not reload the environment if it isn't expired" do
591
591
  env = Puppet::Node::Environment.create(:cached, [])
592
- mocked_loader = mock('loader')
593
- mocked_loader.expects(:get).with(:cached).returns(env).once
594
- mocked_loader.expects(:get_conf).with(:cached).returns(Puppet::Settings::EnvironmentConf.static_for(env, 20)).once
592
+ mocked_loader = double('loader')
593
+ expect(mocked_loader).to receive(:get).with(:cached).and_return(env).once
594
+ expect(mocked_loader).to receive(:get_conf).with(:cached).and_return(Puppet::Settings::EnvironmentConf.static_for(env, 20)).once
595
595
 
596
596
  cached = Puppet::Environments::Cached.new(mocked_loader)
597
597