puppet 6.4.0-x64-mingw32 → 6.4.1-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.

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/agent'
@@ -12,25 +11,25 @@ describe Puppet::Application::Agent do
12
11
  @puppetd = Puppet::Application[:agent]
13
12
 
14
13
  @daemon = Puppet::Daemon.new(nil)
15
- @daemon.stubs(:daemonize)
16
- @daemon.stubs(:start)
17
- @daemon.stubs(:stop)
18
- Puppet::Daemon.stubs(:new).returns(@daemon)
14
+ allow(@daemon).to receive(:daemonize)
15
+ allow(@daemon).to receive(:start)
16
+ allow(@daemon).to receive(:stop)
17
+ allow(Puppet::Daemon).to receive(:new).and_return(@daemon)
19
18
  Puppet[:daemonize] = false
20
19
 
21
- @agent = stub_everything 'agent'
22
- Puppet::Agent.stubs(:new).returns(@agent)
20
+ @agent = double('agent')
21
+ allow(Puppet::Agent).to receive(:new).and_return(@agent)
23
22
 
24
23
  @puppetd.preinit
25
- Puppet::Util::Log.stubs(:newdestination)
24
+ allow(Puppet::Util::Log).to receive(:newdestination)
26
25
 
27
- Puppet::Node.indirection.stubs(:terminus_class=)
28
- Puppet::Node.indirection.stubs(:cache_class=)
29
- Puppet::Node::Facts.indirection.stubs(:terminus_class=)
26
+ allow(Puppet::Node.indirection).to receive(:terminus_class=)
27
+ allow(Puppet::Node.indirection).to receive(:cache_class=)
28
+ allow(Puppet::Node::Facts.indirection).to receive(:terminus_class=)
30
29
 
31
- $stderr.expects(:puts).never
30
+ expect($stderr).not_to receive(:puts)
32
31
 
33
- Puppet.settings.stubs(:use)
32
+ allow(Puppet.settings).to receive(:use)
34
33
  end
35
34
 
36
35
  it "should operate in agent run_mode" do
@@ -55,7 +54,7 @@ describe Puppet::Application::Agent do
55
54
 
56
55
  describe "in preinit" do
57
56
  it "should catch INT" do
58
- Signal.expects(:trap).with { |arg,block| arg == :INT }
57
+ expect(Signal).to receive(:trap).with(:INT)
59
58
 
60
59
  @puppetd.preinit
61
60
  end
@@ -93,7 +92,7 @@ describe Puppet::Application::Agent do
93
92
 
94
93
  describe "when handling options" do
95
94
  before do
96
- @puppetd.command_line.stubs(:args).returns([])
95
+ allow(@puppetd.command_line).to receive(:args).and_return([])
97
96
  end
98
97
 
99
98
  [:enable, :debug, :fqdn, :test, :verbose, :digest].each do |option|
@@ -123,26 +122,26 @@ describe Puppet::Application::Agent do
123
122
  end
124
123
 
125
124
  it "should set waitforcert to 0 with --onetime and if --waitforcert wasn't given" do
126
- @agent.stubs(:run).returns(2)
125
+ allow(@agent).to receive(:run).and_return(2)
127
126
  Puppet[:onetime] = true
128
127
 
129
- Puppet::SSL::StateMachine.expects(:new).with(waitforcert: 0).returns(stub(ensure_client_certificate: nil))
128
+ expect(Puppet::SSL::StateMachine).to receive(:new).with(waitforcert: 0).and_return(double(ensure_client_certificate: nil))
130
129
 
131
130
  expect { execute_agent }.to exit_with 0
132
131
  end
133
132
 
134
133
  it "should use supplied waitforcert when --onetime is specified" do
135
- @agent.stubs(:run).returns(2)
134
+ allow(@agent).to receive(:run).and_return(2)
136
135
  Puppet[:onetime] = true
137
136
  @puppetd.handle_waitforcert(60)
138
137
 
139
- Puppet::SSL::StateMachine.expects(:new).with(waitforcert: 60).returns(stub(ensure_client_certificate: nil))
138
+ expect(Puppet::SSL::StateMachine).to receive(:new).with(waitforcert: 60).and_return(double(ensure_client_certificate: nil))
140
139
 
141
140
  expect { execute_agent }.to exit_with 0
142
141
  end
143
142
 
144
143
  it "should use a default value for waitforcert when --onetime and --waitforcert are not specified" do
145
- Puppet::SSL::StateMachine.expects(:new).with(waitforcert: 120).returns(stub(ensure_client_certificate: nil))
144
+ expect(Puppet::SSL::StateMachine).to receive(:new).with(waitforcert: 120).and_return(double(ensure_client_certificate: nil))
146
145
 
147
146
  execute_agent
148
147
  end
@@ -150,13 +149,13 @@ describe Puppet::Application::Agent do
150
149
  it "should use the waitforcert setting when checking for a signed certificate" do
151
150
  Puppet[:waitforcert] = 10
152
151
 
153
- Puppet::SSL::StateMachine.expects(:new).with(waitforcert: 10).returns(stub(ensure_client_certificate: nil))
152
+ expect(Puppet::SSL::StateMachine).to receive(:new).with(waitforcert: 10).and_return(double(ensure_client_certificate: nil))
154
153
 
155
154
  execute_agent
156
155
  end
157
156
 
158
157
  it "should set the log destination with --logdest" do
159
- Puppet::Log.expects(:newdestination).with("console")
158
+ expect(Puppet::Log).to receive(:newdestination).with("console")
160
159
 
161
160
  @puppetd.handle_logdest("console")
162
161
  end
@@ -168,9 +167,9 @@ describe Puppet::Application::Agent do
168
167
  end
169
168
 
170
169
  it "should parse the log destination from the command line" do
171
- @puppetd.command_line.stubs(:args).returns(%w{--logdest /my/file})
170
+ allow(@puppetd.command_line).to receive(:args).and_return(%w{--logdest /my/file})
172
171
 
173
- Puppet::Util::Log.expects(:newdestination).with("/my/file")
172
+ expect(Puppet::Util::Log).to receive(:newdestination).with("/my/file")
174
173
 
175
174
  @puppetd.parse_options
176
175
  end
@@ -184,25 +183,25 @@ describe Puppet::Application::Agent do
184
183
 
185
184
  describe "during setup" do
186
185
  before :each do
187
- Puppet.stubs(:info)
186
+ allow(Puppet).to receive(:info)
188
187
  Puppet[:libdir] = "/dev/null/lib"
189
- Puppet::Transaction::Report.indirection.stubs(:terminus_class=)
190
- Puppet::Transaction::Report.indirection.stubs(:cache_class=)
191
- Puppet::Resource::Catalog.indirection.stubs(:terminus_class=)
192
- Puppet::Resource::Catalog.indirection.stubs(:cache_class=)
193
- Puppet::Node::Facts.indirection.stubs(:terminus_class=)
194
- Puppet.stubs(:settraps)
188
+ allow(Puppet::Transaction::Report.indirection).to receive(:terminus_class=)
189
+ allow(Puppet::Transaction::Report.indirection).to receive(:cache_class=)
190
+ allow(Puppet::Resource::Catalog.indirection).to receive(:terminus_class=)
191
+ allow(Puppet::Resource::Catalog.indirection).to receive(:cache_class=)
192
+ allow(Puppet::Node::Facts.indirection).to receive(:terminus_class=)
193
+ allow(Puppet).to receive(:settraps)
195
194
  end
196
195
 
197
196
  it "should not run with extra arguments" do
198
- @puppetd.command_line.stubs(:args).returns(%w{disable})
197
+ allow(@puppetd.command_line).to receive(:args).and_return(%w{disable})
199
198
  expect{@puppetd.setup}.to raise_error ArgumentError, /does not take parameters/
200
199
  end
201
200
 
202
201
  describe "with --test" do
203
202
  it "should call setup_test" do
204
203
  @puppetd.options[:test] = true
205
- @puppetd.expects(:setup_test)
204
+ expect(@puppetd).to receive(:setup_test)
206
205
 
207
206
  @puppetd.setup
208
207
  end
@@ -225,13 +224,13 @@ describe Puppet::Application::Agent do
225
224
  end
226
225
 
227
226
  it "should call setup_logs" do
228
- @puppetd.expects(:setup_logs)
227
+ expect(@puppetd).to receive(:setup_logs)
229
228
  @puppetd.setup
230
229
  end
231
230
 
232
231
  describe "when setting up logs" do
233
232
  before :each do
234
- Puppet::Util::Log.stubs(:newdestination)
233
+ allow(Puppet::Util::Log).to receive(:newdestination)
235
234
  end
236
235
 
237
236
  it "should set log level to debug if --debug was passed" do
@@ -250,8 +249,8 @@ describe Puppet::Application::Agent do
250
249
  it "should set console as the log destination with level #{level}" do
251
250
  @puppetd.options[level] = true
252
251
 
253
- Puppet::Util::Log.expects(:newdestination).at_least_once
254
- Puppet::Util::Log.expects(:newdestination).with(:console).once
252
+ allow(Puppet::Util::Log).to receive(:newdestination)
253
+ expect(Puppet::Util::Log).to receive(:newdestination).with(:console).exactly(:once)
255
254
 
256
255
  @puppetd.setup_logs
257
256
  end
@@ -260,16 +259,15 @@ describe Puppet::Application::Agent do
260
259
  it "should set a default log destination if no --logdest" do
261
260
  @puppetd.options[:setdest] = false
262
261
 
263
- Puppet::Util::Log.expects(:setup_default)
262
+ expect(Puppet::Util::Log).to receive(:setup_default)
264
263
 
265
264
  @puppetd.setup_logs
266
265
  end
267
-
268
266
  end
269
267
 
270
268
  it "should print puppet config if asked to in Puppet config" do
271
269
  Puppet[:configprint] = "plugindest"
272
- Puppet.settings.expects(:print_configs).returns true
270
+ expect(Puppet.settings).to receive(:print_configs).and_return(true)
273
271
  expect { execute_agent }.to exit_with 0
274
272
  end
275
273
 
@@ -277,32 +275,31 @@ describe Puppet::Application::Agent do
277
275
  path = make_absolute('/my/path')
278
276
  Puppet[:modulepath] = path
279
277
  Puppet[:configprint] = "modulepath"
280
- Puppet::Settings.any_instance.expects(:puts).with(path)
278
+ expect_any_instance_of(Puppet::Settings).to receive(:puts).with(path)
281
279
  expect { execute_agent }.to exit_with 0
282
280
  end
283
281
 
284
282
  it "should use :main, :puppetd, and :ssl" do
285
- Puppet.settings.unstub(:use)
286
- Puppet.settings.expects(:use).with(:main, :agent, :ssl)
283
+ expect(Puppet.settings).to receive(:use).with(:main, :agent, :ssl)
287
284
 
288
285
  @puppetd.setup
289
286
  end
290
287
 
291
288
  it "should setup an agent in fingerprint mode" do
292
289
  @puppetd.options[:fingerprint] = true
293
- @puppetd.expects(:setup_agent).never
290
+ expect(@puppetd).not_to receive(:setup_agent)
294
291
 
295
292
  @puppetd.setup
296
293
  end
297
294
 
298
295
  it "should tell the report handler to use REST" do
299
- Puppet::Transaction::Report.indirection.expects(:terminus_class=).with(:rest)
296
+ expect(Puppet::Transaction::Report.indirection).to receive(:terminus_class=).with(:rest)
300
297
 
301
298
  @puppetd.setup
302
299
  end
303
300
 
304
301
  it "should tell the report handler to cache locally as yaml" do
305
- Puppet::Transaction::Report.indirection.expects(:cache_class=).with(:yaml)
302
+ expect(Puppet::Transaction::Report.indirection).to receive(:cache_class=).with(:yaml)
306
303
 
307
304
  @puppetd.setup
308
305
  end
@@ -318,7 +315,7 @@ describe Puppet::Application::Agent do
318
315
  end
319
316
 
320
317
  it "has an application default :catalog_cache_terminus setting of 'json'" do
321
- Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(:json)
318
+ expect(Puppet::Resource::Catalog.indirection).to receive(:cache_class=).with(:json)
322
319
 
323
320
  @puppetd.initialize_app_defaults
324
321
  @puppetd.setup
@@ -326,7 +323,7 @@ describe Puppet::Application::Agent do
326
323
 
327
324
  it "should tell the catalog cache class based on the :catalog_cache_terminus setting" do
328
325
  Puppet[:catalog_cache_terminus] = "yaml"
329
- Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(:yaml)
326
+ expect(Puppet::Resource::Catalog.indirection).to receive(:cache_class=).with(:yaml)
330
327
 
331
328
  @puppetd.initialize_app_defaults
332
329
  @puppetd.setup
@@ -334,8 +331,7 @@ describe Puppet::Application::Agent do
334
331
 
335
332
  it "should not set catalog cache class if :catalog_cache_terminus is explicitly nil" do
336
333
  Puppet[:catalog_cache_terminus] = nil
337
- Puppet::Resource::Catalog.indirection.unstub(:cache_class=)
338
- Puppet::Resource::Catalog.indirection.expects(:cache_class=).never
334
+ expect(Puppet::Resource::Catalog.indirection).not_to receive(:cache_class=)
339
335
 
340
336
  @puppetd.initialize_app_defaults
341
337
  @puppetd.setup
@@ -347,7 +343,7 @@ describe Puppet::Application::Agent do
347
343
  end
348
344
 
349
345
  it "should create an agent" do
350
- Puppet::Agent.stubs(:new).with(Puppet::Configurer)
346
+ allow(Puppet::Agent).to receive(:new).with(Puppet::Configurer)
351
347
 
352
348
  @puppetd.setup
353
349
  end
@@ -355,7 +351,7 @@ describe Puppet::Application::Agent do
355
351
  [:enable, :disable].each do |action|
356
352
  it "should delegate to enable_disable_client if we #{action} the agent" do
357
353
  @puppetd.options[action] = true
358
- @puppetd.expects(:enable_disable_client).with(@agent)
354
+ expect(@puppetd).to receive(:enable_disable_client).with(@agent)
359
355
 
360
356
  @puppetd.setup
361
357
  end
@@ -365,7 +361,7 @@ describe Puppet::Application::Agent do
365
361
  [:enable, :disable].each do |action|
366
362
  it "should call client.#{action}" do
367
363
  @puppetd.options[action] = true
368
- @agent.expects(action)
364
+ expect(@agent).to receive(action)
369
365
  expect { execute_agent }.to exit_with 0
370
366
  end
371
367
  end
@@ -373,7 +369,7 @@ describe Puppet::Application::Agent do
373
369
  it "should pass the disable message when disabling" do
374
370
  @puppetd.options[:disable] = true
375
371
  @puppetd.options[:disable_message] = "message"
376
- @agent.expects(:disable).with("message")
372
+ expect(@agent).to receive(:disable).with("message")
377
373
 
378
374
  expect { execute_agent }.to exit_with 0
379
375
  end
@@ -381,7 +377,7 @@ describe Puppet::Application::Agent do
381
377
  it "should pass the default disable message when disabling without a message" do
382
378
  @puppetd.options[:disable] = true
383
379
  @puppetd.options[:disable_message] = nil
384
- @agent.expects(:disable).with("reason not specified")
380
+ expect(@agent).to receive(:disable).with("reason not specified")
385
381
 
386
382
  expect { execute_agent }.to exit_with 0
387
383
  end
@@ -390,7 +386,7 @@ describe Puppet::Application::Agent do
390
386
  it "should inform the daemon about our agent if :client is set to 'true'" do
391
387
  @puppetd.options[:client] = true
392
388
 
393
- Puppet::SSL::StateMachine.stubs(:new).returns(stub(ensure_client_certificate: nil))
389
+ allow(Puppet::SSL::StateMachine).to receive(:new).and_return(double(ensure_client_certificate: nil))
394
390
 
395
391
  execute_agent
396
392
 
@@ -398,13 +394,13 @@ describe Puppet::Application::Agent do
398
394
  end
399
395
 
400
396
  it "should daemonize if needed" do
401
- Puppet::Util::Platform.stubs(:windows?).returns false
397
+ allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
402
398
  Puppet[:daemonize] = true
403
- Signal.stubs(:trap)
399
+ allow(Signal).to receive(:trap)
404
400
 
405
- Puppet::SSL::StateMachine.stubs(:new).returns(stub(ensure_client_certificate: nil))
401
+ allow(Puppet::SSL::StateMachine).to receive(:new).and_return(double(ensure_client_certificate: nil))
406
402
 
407
- @daemon.expects(:daemonize)
403
+ expect(@daemon).to receive(:daemonize)
408
404
 
409
405
  execute_agent
410
406
  end
@@ -412,7 +408,7 @@ describe Puppet::Application::Agent do
412
408
  it "should wait for a certificate" do
413
409
  @puppetd.options[:waitforcert] = 123
414
410
 
415
- Puppet::SSL::StateMachine.expects(:new).with(waitforcert: 123).returns(stub(ensure_client_certificate: nil))
411
+ expect(Puppet::SSL::StateMachine).to receive(:new).with(waitforcert: 123).and_return(double(ensure_client_certificate: nil))
416
412
 
417
413
  execute_agent
418
414
  end
@@ -422,12 +418,12 @@ describe Puppet::Application::Agent do
422
418
  @puppetd.options[:waitforcert] = 123
423
419
  @puppetd.options[:digest] = 'MD5'
424
420
 
425
- certificate = mock 'certificate'
426
- certificate.stubs(:to_der).returns('ABCDE')
427
- ssl_context = mock('ssl_context', client_cert: certificate)
428
- Puppet::SSL::StateMachine.stubs(:new).with(onetime: true).returns(stub(ensure_client_certificate: ssl_context))
421
+ certificate = double('certificate')
422
+ allow(certificate).to receive(:to_der).and_return('ABCDE')
423
+ ssl_context = double('ssl_context', client_cert: certificate)
424
+ allow(Puppet::SSL::StateMachine).to receive(:new).with(onetime: true).and_return(double(ensure_client_certificate: ssl_context))
429
425
 
430
- @puppetd.expects(:puts).with('(MD5) 2E:CD:DE:39:59:05:1D:91:3F:61:B1:45:79:EA:13:6D')
426
+ expect(@puppetd).to receive(:puts).with('(MD5) 2E:CD:DE:39:59:05:1D:91:3F:61:B1:45:79:EA:13:6D')
431
427
 
432
428
  execute_agent
433
429
  end
@@ -438,36 +434,35 @@ describe Puppet::Application::Agent do
438
434
  end
439
435
 
440
436
  it "should not setup as an agent" do
441
- @puppetd.expects(:setup_agent).never
437
+ expect(@puppetd).not_to receive(:setup_agent)
442
438
  @puppetd.setup
443
439
  end
444
440
 
445
441
  it "should not create an agent" do
446
- Puppet::Agent.stubs(:new).with(Puppet::Configurer).never
442
+ expect(Puppet::Agent).not_to receive(:new).with(Puppet::Configurer)
447
443
  @puppetd.setup
448
444
  end
449
445
 
450
446
  it "should not daemonize" do
451
- @daemon.expects(:daemonize).never
447
+ expect(@daemon).not_to receive(:daemonize)
452
448
  @puppetd.setup
453
449
  end
454
450
  end
455
451
 
456
452
  describe "when configuring agent for catalog run" do
457
453
  it "should set should_fork as true when running normally" do
458
- Puppet::Agent.expects(:new).with(anything, true)
454
+ expect(Puppet::Agent).to receive(:new).with(anything, true)
459
455
  @puppetd.setup
460
456
  end
461
457
 
462
458
  it "should not set should_fork as false for --onetime" do
463
459
  Puppet[:onetime] = true
464
- Puppet::Agent.expects(:new).with(anything, false)
460
+ expect(Puppet::Agent).to receive(:new).with(anything, false)
465
461
  @puppetd.setup
466
462
  end
467
463
  end
468
464
  end
469
465
 
470
-
471
466
  describe "when running" do
472
467
  before :each do
473
468
  @puppetd.options[:fingerprint] = false
@@ -476,61 +471,60 @@ describe Puppet::Application::Agent do
476
471
  it "should dispatch to fingerprint if --fingerprint is used" do
477
472
  @puppetd.options[:fingerprint] = true
478
473
 
479
- @puppetd.expects(:fingerprint)
474
+ expect(@puppetd).to receive(:fingerprint)
480
475
 
481
476
  execute_agent
482
477
  end
483
478
 
484
479
  it "should dispatch to onetime if --onetime is used" do
485
480
  Puppet[:onetime] = true
486
- Puppet::SSL::StateMachine.stubs(:new).returns(stub(ensure_client_certificate: nil))
481
+ allow(Puppet::SSL::StateMachine).to receive(:new).and_return(double(ensure_client_certificate: nil))
487
482
 
488
- @puppetd.expects(:onetime)
483
+ expect(@puppetd).to receive(:onetime)
489
484
 
490
485
  execute_agent
491
486
  end
492
487
 
493
488
  it "should dispatch to main if --onetime and --fingerprint are not used" do
494
489
  Puppet[:onetime] = false
495
- Puppet::SSL::StateMachine.stubs(:new).returns(stub(ensure_client_certificate: nil))
490
+ allow(Puppet::SSL::StateMachine).to receive(:new).and_return(double(ensure_client_certificate: nil))
496
491
 
497
- @puppetd.expects(:main)
492
+ expect(@puppetd).to receive(:main)
498
493
 
499
494
  execute_agent
500
495
  end
501
496
 
502
497
  describe "with --onetime" do
503
-
504
498
  before :each do
505
- @agent.stubs(:run).returns(:report)
499
+ allow(@agent).to receive(:run).and_return(:report)
506
500
  Puppet[:onetime] = true
507
501
  @puppetd.options[:client] = :client
508
502
  @puppetd.options[:detailed_exitcodes] = false
509
503
 
510
- Puppet::SSL::StateMachine.stubs(:new).returns(stub(ensure_client_certificate: nil))
504
+ allow(Puppet::SSL::StateMachine).to receive(:new).and_return(double(ensure_client_certificate: nil))
511
505
  end
512
506
 
513
507
  it "should setup traps" do
514
- @daemon.expects(:set_signal_traps)
508
+ expect(@daemon).to receive(:set_signal_traps)
515
509
 
516
510
  expect { execute_agent }.to exit_with 0
517
511
  end
518
512
 
519
513
  it "should let the agent run" do
520
- @agent.expects(:run).returns(:report)
514
+ expect(@agent).to receive(:run).and_return(:report)
521
515
 
522
516
  expect { execute_agent }.to exit_with 0
523
517
  end
524
518
 
525
519
  it "should run the agent with the supplied job_id" do
526
520
  @puppetd.options[:job_id] = 'special id'
527
- @agent.expects(:run).with(:job_id => 'special id').returns(:report)
521
+ expect(@agent).to receive(:run).with(:job_id => 'special id').and_return(:report)
528
522
 
529
523
  expect { execute_agent }.to exit_with 0
530
524
  end
531
525
 
532
526
  it "should stop the daemon" do
533
- @daemon.expects(:stop).with(:exit => false)
527
+ expect(@daemon).to receive(:stop).with(:exit => false)
534
528
 
535
529
  expect { execute_agent }.to exit_with 0
536
530
  end
@@ -542,14 +536,14 @@ describe Puppet::Application::Agent do
542
536
 
543
537
  it "should exit with agent computed exit status" do
544
538
  Puppet[:noop] = false
545
- @agent.stubs(:run).returns(666)
539
+ allow(@agent).to receive(:run).and_return(666)
546
540
 
547
541
  expect { execute_agent }.to exit_with 666
548
542
  end
549
543
 
550
544
  it "should exit with the agent's exit status, even if --noop is set." do
551
545
  Puppet[:noop] = true
552
- @agent.stubs(:run).returns(666)
546
+ allow(@agent).to receive(:run).and_return(666)
553
547
 
554
548
  expect { execute_agent }.to exit_with 666
555
549
  end
@@ -558,17 +552,17 @@ describe Puppet::Application::Agent do
558
552
 
559
553
  describe "with --fingerprint" do
560
554
  before :each do
561
- @cert = mock 'cert'
555
+ @cert = double('cert')
562
556
  @puppetd.options[:fingerprint] = true
563
557
  @puppetd.options[:digest] = :MD5
564
558
  end
565
559
 
566
560
  it "should fingerprint the certificate if it exists" do
567
- @cert.stubs(:to_der).returns('ABCDE')
568
- ssl_context = mock('ssl_context', client_cert: @cert)
569
- Puppet::SSL::StateMachine.stubs(:new).with(onetime: true).returns(stub(ensure_client_certificate: ssl_context))
561
+ allow(@cert).to receive(:to_der).and_return('ABCDE')
562
+ ssl_context = double('ssl_context', client_cert: @cert)
563
+ allow(Puppet::SSL::StateMachine).to receive(:new).with(onetime: true).and_return(double(ensure_client_certificate: ssl_context))
570
564
 
571
- @puppetd.expects(:puts).with('(MD5) 2E:CD:DE:39:59:05:1D:91:3F:61:B1:45:79:EA:13:6D')
565
+ expect(@puppetd).to receive(:puts).with('(MD5) 2E:CD:DE:39:59:05:1D:91:3F:61:B1:45:79:EA:13:6D')
572
566
 
573
567
  @puppetd.fingerprint
574
568
  end
@@ -576,12 +570,12 @@ describe Puppet::Application::Agent do
576
570
 
577
571
  describe "without --onetime and --fingerprint" do
578
572
  before :each do
579
- Puppet.stubs(:notice)
580
- Puppet::SSL::StateMachine.stubs(:new).returns(stub(ensure_client_certificate: nil))
573
+ allow(Puppet).to receive(:notice)
574
+ allow(Puppet::SSL::StateMachine).to receive(:new).and_return(double(ensure_client_certificate: nil))
581
575
  end
582
576
 
583
577
  it "should start our daemon" do
584
- @daemon.expects(:start)
578
+ expect(@daemon).to receive(:start)
585
579
 
586
580
  execute_agent
587
581
  end