puppet 6.0.7-x86-mingw32 → 6.0.8-x86-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 (632) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +4 -8
  4. data/lib/puppet/application/device.rb +99 -83
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/configurer.rb +5 -4
  7. data/lib/puppet/defaults.rb +31 -11
  8. data/lib/puppet/indirector/request.rb +26 -15
  9. data/lib/puppet/network/http/connection.rb +15 -7
  10. data/lib/puppet/transaction/event_manager.rb +1 -5
  11. data/lib/puppet/type/file/source.rb +0 -1
  12. data/lib/puppet/util/connection.rb +15 -6
  13. data/lib/puppet/util/http_proxy.rb +3 -2
  14. data/lib/puppet/version.rb +1 -1
  15. data/locales/puppet.pot +99 -40
  16. data/man/man5/puppet.conf.5 +8 -8
  17. data/man/man8/puppet-agent.8 +1 -1
  18. data/man/man8/puppet-apply.8 +1 -1
  19. data/man/man8/puppet-catalog.8 +1 -1
  20. data/man/man8/puppet-config.8 +1 -1
  21. data/man/man8/puppet-describe.8 +1 -1
  22. data/man/man8/puppet-device.8 +1 -1
  23. data/man/man8/puppet-doc.8 +1 -1
  24. data/man/man8/puppet-epp.8 +1 -1
  25. data/man/man8/puppet-facts.8 +1 -1
  26. data/man/man8/puppet-filebucket.8 +1 -1
  27. data/man/man8/puppet-generate.8 +1 -1
  28. data/man/man8/puppet-help.8 +1 -1
  29. data/man/man8/puppet-key.8 +1 -1
  30. data/man/man8/puppet-lookup.8 +1 -1
  31. data/man/man8/puppet-man.8 +1 -1
  32. data/man/man8/puppet-module.8 +1 -1
  33. data/man/man8/puppet-node.8 +1 -1
  34. data/man/man8/puppet-parser.8 +1 -1
  35. data/man/man8/puppet-plugin.8 +1 -1
  36. data/man/man8/puppet-report.8 +1 -1
  37. data/man/man8/puppet-resource.8 +1 -1
  38. data/man/man8/puppet-script.8 +1 -1
  39. data/man/man8/puppet-ssl.8 +1 -1
  40. data/man/man8/puppet-status.8 +1 -1
  41. data/man/man8/puppet.8 +2 -2
  42. data/spec/integration/agent/logging_spec.rb +5 -7
  43. data/spec/integration/application/apply_spec.rb +18 -16
  44. data/spec/integration/application/doc_spec.rb +1 -2
  45. data/spec/integration/application/lookup_spec.rb +5 -5
  46. data/spec/integration/configurer_spec.rb +5 -6
  47. data/spec/integration/defaults_spec.rb +5 -6
  48. data/spec/integration/directory_environments_spec.rb +1 -1
  49. data/spec/integration/faces/config_spec.rb +3 -4
  50. data/spec/integration/faces/documentation_spec.rb +0 -1
  51. data/spec/integration/faces/plugin_spec.rb +1 -1
  52. data/spec/integration/file_bucket/file_spec.rb +2 -4
  53. data/spec/integration/file_serving/content_spec.rb +0 -1
  54. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  55. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  56. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  57. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  58. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  59. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  60. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  61. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  62. data/spec/integration/network/authconfig_spec.rb +23 -24
  63. data/spec/integration/network/formats_spec.rb +0 -1
  64. data/spec/integration/node/environment_spec.rb +0 -1
  65. data/spec/integration/node/facts_spec.rb +9 -10
  66. data/spec/integration/node_spec.rb +6 -7
  67. data/spec/integration/parser/catalog_spec.rb +1 -5
  68. data/spec/integration/parser/collection_spec.rb +1 -2
  69. data/spec/integration/parser/compiler_spec.rb +6 -6
  70. data/spec/integration/parser/scope_spec.rb +1 -1
  71. data/spec/integration/parser/undef_param_spec.rb +1 -1
  72. data/spec/integration/provider/service/init_spec.rb +4 -5
  73. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  74. data/spec/integration/provider/service/windows_spec.rb +1 -2
  75. data/spec/integration/reference/providers_spec.rb +1 -2
  76. data/spec/integration/reports_spec.rb +1 -2
  77. data/spec/integration/resource/catalog_spec.rb +14 -17
  78. data/spec/integration/resource/type_collection_spec.rb +4 -5
  79. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  80. data/spec/integration/ssl/host_spec.rb +1 -2
  81. data/spec/integration/ssl/key_spec.rb +0 -1
  82. data/spec/integration/test/test_helper_spec.rb +0 -1
  83. data/spec/integration/transaction/report_spec.rb +6 -11
  84. data/spec/integration/transaction_spec.rb +18 -19
  85. data/spec/integration/type/exec_spec.rb +0 -1
  86. data/spec/integration/type/file_spec.rb +13 -14
  87. data/spec/integration/type/package_spec.rb +19 -23
  88. data/spec/integration/type/tidy_spec.rb +1 -2
  89. data/spec/integration/type_spec.rb +0 -1
  90. data/spec/integration/util/autoload_spec.rb +1 -2
  91. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  92. data/spec/integration/util/settings_spec.rb +0 -1
  93. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  94. data/spec/integration/util/windows/principal_spec.rb +0 -1
  95. data/spec/integration/util/windows/process_spec.rb +4 -6
  96. data/spec/integration/util/windows/registry_spec.rb +41 -51
  97. data/spec/integration/util/windows/security_spec.rb +2 -4
  98. data/spec/integration/util/windows/user_spec.rb +18 -20
  99. data/spec/integration/util_spec.rb +4 -7
  100. data/spec/lib/puppet_spec/compiler.rb +1 -1
  101. data/spec/lib/puppet_spec/files.rb +0 -1
  102. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  103. data/spec/lib/puppet_spec/scope.rb +1 -2
  104. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  105. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  106. data/spec/shared_behaviours/file_serving.rb +6 -8
  107. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  108. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  109. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  110. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  111. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  112. data/spec/spec_helper.rb +10 -1
  113. data/spec/unit/agent/disabler_spec.rb +4 -5
  114. data/spec/unit/agent/locker_spec.rb +12 -13
  115. data/spec/unit/agent_spec.rb +80 -85
  116. data/spec/unit/application/agent_spec.rb +88 -93
  117. data/spec/unit/application/apply_spec.rb +82 -83
  118. data/spec/unit/application/config_spec.rb +0 -1
  119. data/spec/unit/application/describe_spec.rb +6 -7
  120. data/spec/unit/application/device_spec.rb +395 -419
  121. data/spec/unit/application/doc_spec.rb +44 -46
  122. data/spec/unit/application/face_base_spec.rb +61 -62
  123. data/spec/unit/application/facts_spec.rb +3 -4
  124. data/spec/unit/application/filebucket_spec.rb +66 -74
  125. data/spec/unit/application/indirection_base_spec.rb +8 -6
  126. data/spec/unit/application/lookup_spec.rb +26 -26
  127. data/spec/unit/application/resource_spec.rb +42 -48
  128. data/spec/unit/application/ssl_spec.rb +3 -3
  129. data/spec/unit/application_spec.rb +82 -92
  130. data/spec/unit/capability_spec.rb +6 -6
  131. data/spec/unit/certificate_factory_spec.rb +3 -5
  132. data/spec/unit/configurer/downloader_spec.rb +20 -21
  133. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  134. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  135. data/spec/unit/configurer_spec.rb +189 -192
  136. data/spec/unit/confine/exists_spec.rb +17 -15
  137. data/spec/unit/confine/false_spec.rb +5 -6
  138. data/spec/unit/confine/feature_spec.rb +7 -5
  139. data/spec/unit/confine/true_spec.rb +5 -6
  140. data/spec/unit/confine/variable_spec.rb +14 -15
  141. data/spec/unit/confine_collection_spec.rb +28 -29
  142. data/spec/unit/confine_spec.rb +13 -14
  143. data/spec/unit/confiner_spec.rb +10 -11
  144. data/spec/unit/context/trusted_information_spec.rb +1 -1
  145. data/spec/unit/daemon_spec.rb +35 -36
  146. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  147. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  148. data/spec/unit/datatypes_spec.rb +3 -4
  149. data/spec/unit/defaults_spec.rb +18 -13
  150. data/spec/unit/environments_spec.rb +7 -7
  151. data/spec/unit/etc_spec.rb +30 -32
  152. data/spec/unit/external/pson_spec.rb +0 -1
  153. data/spec/unit/face/catalog_spec.rb +0 -1
  154. data/spec/unit/face/config_spec.rb +31 -35
  155. data/spec/unit/face/epp_face_spec.rb +3 -4
  156. data/spec/unit/face/facts_spec.rb +5 -6
  157. data/spec/unit/face/generate_spec.rb +4 -5
  158. data/spec/unit/face/help_spec.rb +7 -8
  159. data/spec/unit/face/key_spec.rb +0 -1
  160. data/spec/unit/face/man_spec.rb +1 -2
  161. data/spec/unit/face/module/install_spec.rb +3 -5
  162. data/spec/unit/face/module/list_spec.rb +2 -12
  163. data/spec/unit/face/module/search_spec.rb +11 -9
  164. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  165. data/spec/unit/face/node_spec.rb +23 -24
  166. data/spec/unit/face/parser_spec.rb +3 -3
  167. data/spec/unit/face/plugin_spec.rb +36 -9
  168. data/spec/unit/face/status_spec.rb +0 -1
  169. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  170. data/spec/unit/file_bucket/file_spec.rb +0 -2
  171. data/spec/unit/file_serving/base_spec.rb +14 -15
  172. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  173. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  174. data/spec/unit/file_serving/content_spec.rb +10 -11
  175. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  176. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  177. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  178. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  179. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  180. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  181. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  182. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  183. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  184. data/spec/unit/file_serving/mount_spec.rb +0 -1
  185. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  186. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  187. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  188. data/spec/unit/file_system_spec.rb +2 -2
  189. data/spec/unit/forge/errors_spec.rb +1 -1
  190. data/spec/unit/forge/forge_spec.rb +13 -14
  191. data/spec/unit/forge/module_release_spec.rb +18 -18
  192. data/spec/unit/forge/repository_spec.rb +29 -30
  193. data/spec/unit/forge_spec.rb +15 -11
  194. data/spec/unit/functions/binary_file_spec.rb +3 -3
  195. data/spec/unit/functions/contain_spec.rb +0 -2
  196. data/spec/unit/functions/defined_spec.rb +0 -1
  197. data/spec/unit/functions/epp_spec.rb +2 -2
  198. data/spec/unit/functions/find_file_spec.rb +7 -7
  199. data/spec/unit/functions/include_spec.rb +0 -4
  200. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  201. data/spec/unit/functions/lookup_spec.rb +1 -2
  202. data/spec/unit/functions/module_directory_spec.rb +12 -12
  203. data/spec/unit/functions/require_spec.rb +0 -3
  204. data/spec/unit/functions/shared.rb +5 -8
  205. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  206. data/spec/unit/functions4_spec.rb +9 -10
  207. data/spec/unit/gettext/config_spec.rb +4 -4
  208. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  209. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  210. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  211. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  212. data/spec/unit/hiera_puppet_spec.rb +20 -20
  213. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  214. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  215. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  216. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  217. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  218. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  219. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  220. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  221. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  222. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  223. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  224. data/spec/unit/indirector/envelope_spec.rb +1 -2
  225. data/spec/unit/indirector/exec_spec.rb +4 -5
  226. data/spec/unit/indirector/face_spec.rb +9 -9
  227. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  228. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  229. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  230. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  231. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  232. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  233. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  234. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  235. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  236. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  237. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  238. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  239. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  240. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  241. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  242. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  243. data/spec/unit/indirector/file_server_spec.rb +87 -87
  244. data/spec/unit/indirector/indirection_spec.rb +242 -226
  245. data/spec/unit/indirector/json_spec.rb +7 -9
  246. data/spec/unit/indirector/key/file_spec.rb +21 -22
  247. data/spec/unit/indirector/memory_spec.rb +6 -7
  248. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  249. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  250. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  251. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  252. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  253. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  254. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  255. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  256. data/spec/unit/indirector/none_spec.rb +5 -5
  257. data/spec/unit/indirector/plain_spec.rb +7 -8
  258. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  259. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  260. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  261. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  262. data/spec/unit/indirector/request_spec.rb +11 -12
  263. data/spec/unit/indirector/resource/ral_spec.rb +46 -54
  264. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  265. data/spec/unit/indirector/rest_spec.rb +113 -110
  266. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  267. data/spec/unit/indirector/status/local_spec.rb +0 -1
  268. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  269. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  270. data/spec/unit/indirector/terminus_spec.rb +27 -27
  271. data/spec/unit/indirector/yaml_spec.rb +5 -6
  272. data/spec/unit/indirector_spec.rb +1 -2
  273. data/spec/unit/info_service_spec.rb +1 -1
  274. data/spec/unit/interface/action_builder_spec.rb +0 -1
  275. data/spec/unit/interface/action_manager_spec.rb +0 -1
  276. data/spec/unit/interface/action_spec.rb +2 -3
  277. data/spec/unit/interface/documentation_spec.rb +0 -1
  278. data/spec/unit/interface/face_collection_spec.rb +19 -12
  279. data/spec/unit/interface_spec.rb +3 -3
  280. data/spec/unit/man_spec.rb +3 -4
  281. data/spec/unit/module_spec.rb +46 -51
  282. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  283. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  284. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  285. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  286. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  287. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  288. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  289. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  290. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  291. data/spec/unit/module_tool/tar_spec.rb +12 -13
  292. data/spec/unit/module_tool_spec.rb +7 -12
  293. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  294. data/spec/unit/network/authconfig_spec.rb +17 -18
  295. data/spec/unit/network/authorization_spec.rb +4 -5
  296. data/spec/unit/network/authstore_spec.rb +0 -1
  297. data/spec/unit/network/format_handler_spec.rb +0 -1
  298. data/spec/unit/network/format_spec.rb +9 -10
  299. data/spec/unit/network/format_support_spec.rb +28 -29
  300. data/spec/unit/network/formats_spec.rb +4 -5
  301. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  302. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  303. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  304. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  305. data/spec/unit/network/http/api_spec.rb +0 -2
  306. data/spec/unit/network/http/compression_spec.rb +21 -22
  307. data/spec/unit/network/http/connection_spec.rb +41 -36
  308. data/spec/unit/network/http/factory_spec.rb +5 -6
  309. data/spec/unit/network/http/handler_spec.rb +9 -18
  310. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  311. data/spec/unit/network/http/pool_spec.rb +28 -29
  312. data/spec/unit/network/http/request_spec.rb +0 -2
  313. data/spec/unit/network/http/response_spec.rb +11 -13
  314. data/spec/unit/network/http/route_spec.rb +0 -1
  315. data/spec/unit/network/http/session_spec.rb +1 -2
  316. data/spec/unit/network/http/site_spec.rb +0 -1
  317. data/spec/unit/network/http_pool_spec.rb +18 -9
  318. data/spec/unit/network/http_spec.rb +0 -1
  319. data/spec/unit/network/resolver_spec.rb +25 -26
  320. data/spec/unit/network/rights_spec.rb +52 -53
  321. data/spec/unit/node/environment_spec.rb +14 -15
  322. data/spec/unit/node/facts_spec.rb +5 -7
  323. data/spec/unit/node_spec.rb +4 -10
  324. data/spec/unit/other/selinux_spec.rb +0 -1
  325. data/spec/unit/parameter/boolean_spec.rb +1 -2
  326. data/spec/unit/parameter/package_options_spec.rb +1 -2
  327. data/spec/unit/parameter/path_spec.rb +0 -1
  328. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  329. data/spec/unit/parameter/value_spec.rb +0 -1
  330. data/spec/unit/parameter_spec.rb +9 -9
  331. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  332. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  333. data/spec/unit/parser/compiler_spec.rb +84 -96
  334. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  335. data/spec/unit/parser/files_spec.rb +0 -1
  336. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  337. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  338. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  339. data/spec/unit/parser/functions/file_spec.rb +13 -14
  340. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  341. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  342. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  343. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  344. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  345. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  346. data/spec/unit/parser/functions/split_spec.rb +0 -1
  347. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  348. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  349. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  350. data/spec/unit/parser/functions/template_spec.rb +13 -13
  351. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  352. data/spec/unit/parser/functions_spec.rb +6 -7
  353. data/spec/unit/parser/relationship_spec.rb +0 -1
  354. data/spec/unit/parser/resource_spec.rb +42 -42
  355. data/spec/unit/parser/scope_spec.rb +39 -35
  356. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  357. data/spec/unit/parser/type_loader_spec.rb +17 -19
  358. data/spec/unit/pops/adaptable_spec.rb +0 -1
  359. data/spec/unit/pops/benchmark_spec.rb +0 -1
  360. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  361. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  362. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  363. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  364. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  365. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  366. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  367. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  368. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  371. data/spec/unit/pops/factory_spec.rb +3 -4
  372. data/spec/unit/pops/issues_spec.rb +19 -20
  373. data/spec/unit/pops/loaders/loader_spec.rb +8 -4
  374. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  375. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  376. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  377. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  378. data/spec/unit/pops/migration_spec.rb +3 -5
  379. data/spec/unit/pops/model/model_spec.rb +0 -1
  380. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  381. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  382. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  383. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  384. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  385. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  386. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  387. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  388. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  389. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  390. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  391. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  392. data/spec/unit/pops/pn_spec.rb +0 -1
  393. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  394. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  395. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  396. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  397. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  398. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  399. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  400. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  401. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  402. data/spec/unit/pops/visitor_spec.rb +0 -1
  403. data/spec/unit/property/boolean_spec.rb +1 -1
  404. data/spec/unit/property/ensure_spec.rb +0 -1
  405. data/spec/unit/property/keyvalue_spec.rb +32 -34
  406. data/spec/unit/property/list_spec.rb +26 -27
  407. data/spec/unit/property/ordered_list_spec.rb +10 -14
  408. data/spec/unit/property_spec.rb +42 -43
  409. data/spec/unit/provider/aix_object_spec.rb +47 -45
  410. data/spec/unit/provider/command_spec.rb +9 -9
  411. data/spec/unit/provider/exec/posix_spec.rb +6 -7
  412. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  413. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  414. data/spec/unit/provider/exec_spec.rb +0 -1
  415. data/spec/unit/provider/file/posix_spec.rb +22 -24
  416. data/spec/unit/provider/file/windows_spec.rb +15 -17
  417. data/spec/unit/provider/group/aix_spec.rb +3 -2
  418. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  419. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  420. data/spec/unit/provider/group/pw_spec.rb +11 -11
  421. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  422. data/spec/unit/provider/ldap_spec.rb +61 -62
  423. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  424. data/spec/unit/provider/nameservice_spec.rb +38 -40
  425. data/spec/unit/provider/package/aix_spec.rb +15 -15
  426. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  427. data/spec/unit/provider/package/apt_spec.rb +44 -27
  428. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  429. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  430. data/spec/unit/provider/package/base_spec.rb +4 -4
  431. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  432. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  433. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  434. data/spec/unit/provider/package/gem_spec.rb +51 -43
  435. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  436. data/spec/unit/provider/package/macports_spec.rb +46 -42
  437. data/spec/unit/provider/package/nim_spec.rb +30 -39
  438. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  439. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  440. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  441. data/spec/unit/provider/package/pip_spec.rb +71 -72
  442. data/spec/unit/provider/package/pkg_spec.rb +109 -109
  443. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  444. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  445. data/spec/unit/provider/package/pkgng_spec.rb +17 -18
  446. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  447. data/spec/unit/provider/package/portage_spec.rb +70 -74
  448. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  449. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  450. data/spec/unit/provider/package/sun_spec.rb +16 -18
  451. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  452. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  453. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  454. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  455. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  456. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  457. data/spec/unit/provider/package/windows_spec.rb +36 -32
  458. data/spec/unit/provider/package/yum_spec.rb +7 -7
  459. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  460. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  461. data/spec/unit/provider/service/base_spec.rb +4 -5
  462. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  463. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  464. data/spec/unit/provider/service/debian_spec.rb +38 -38
  465. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  466. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  467. data/spec/unit/provider/service/init_spec.rb +53 -52
  468. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  469. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  470. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  471. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  472. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  473. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  474. data/spec/unit/provider/service/runit_spec.rb +29 -27
  475. data/spec/unit/provider/service/smf_spec.rb +74 -66
  476. data/spec/unit/provider/service/src_spec.rb +46 -47
  477. data/spec/unit/provider/service/systemd_spec.rb +104 -113
  478. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  479. data/spec/unit/provider/service/windows_spec.rb +33 -41
  480. data/spec/unit/provider/user/aix_spec.rb +31 -31
  481. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  482. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  483. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  484. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  485. data/spec/unit/provider/user/pw_spec.rb +37 -35
  486. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  487. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  488. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  489. data/spec/unit/provider_spec.rb +35 -35
  490. data/spec/unit/puppet_pal_2pec.rb +4 -5
  491. data/spec/unit/puppet_pal_spec.rb +0 -1
  492. data/spec/unit/puppet_spec.rb +6 -7
  493. data/spec/unit/relationship_spec.rb +0 -1
  494. data/spec/unit/reports/http_spec.rb +21 -23
  495. data/spec/unit/reports/store_spec.rb +3 -4
  496. data/spec/unit/reports_spec.rb +12 -14
  497. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  498. data/spec/unit/resource/catalog_spec.rb +72 -68
  499. data/spec/unit/resource/status_spec.rb +6 -8
  500. data/spec/unit/resource/type_collection_spec.rb +17 -18
  501. data/spec/unit/resource/type_spec.rb +34 -35
  502. data/spec/unit/resource_spec.rb +36 -32
  503. data/spec/unit/rest/client_spec.rb +58 -27
  504. data/spec/unit/rest/route_spec.rb +5 -5
  505. data/spec/unit/scheduler/job_spec.rb +0 -1
  506. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  507. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  508. data/spec/unit/settings/array_setting_spec.rb +1 -1
  509. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  510. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  511. data/spec/unit/settings/config_file_spec.rb +0 -1
  512. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  513. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  514. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  515. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  516. data/spec/unit/settings/file_setting_spec.rb +44 -46
  517. data/spec/unit/settings/path_setting_spec.rb +1 -2
  518. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  519. data/spec/unit/settings/string_setting_spec.rb +14 -15
  520. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  521. data/spec/unit/settings/value_translator_spec.rb +0 -1
  522. data/spec/unit/settings_spec.rb +228 -235
  523. data/spec/unit/ssl/base_spec.rb +14 -15
  524. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  525. data/spec/unit/ssl/certificate_spec.rb +23 -25
  526. data/spec/unit/ssl/digest_spec.rb +0 -1
  527. data/spec/unit/ssl/host_spec.rb +166 -149
  528. data/spec/unit/ssl/key_spec.rb +30 -31
  529. data/spec/unit/ssl/validator_spec.rb +38 -39
  530. data/spec/unit/task_spec.rb +44 -45
  531. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  532. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  533. data/spec/unit/transaction/event_spec.rb +16 -15
  534. data/spec/unit/transaction/persistence_spec.rb +16 -17
  535. data/spec/unit/transaction/report_spec.rb +11 -12
  536. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  537. data/spec/unit/transaction_spec.rb +100 -101
  538. data/spec/unit/type/component_spec.rb +0 -1
  539. data/spec/unit/type/exec_spec.rb +60 -56
  540. data/spec/unit/type/file/checksum_spec.rb +9 -10
  541. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  542. data/spec/unit/type/file/content_spec.rb +58 -61
  543. data/spec/unit/type/file/ctime_spec.rb +0 -1
  544. data/spec/unit/type/file/ensure_spec.rb +12 -13
  545. data/spec/unit/type/file/group_spec.rb +5 -7
  546. data/spec/unit/type/file/mode_spec.rb +4 -6
  547. data/spec/unit/type/file/mtime_spec.rb +0 -1
  548. data/spec/unit/type/file/owner_spec.rb +6 -8
  549. data/spec/unit/type/file/selinux_spec.rb +17 -19
  550. data/spec/unit/type/file/source_spec.rb +104 -101
  551. data/spec/unit/type/file/type_spec.rb +0 -1
  552. data/spec/unit/type/file_spec.rb +195 -185
  553. data/spec/unit/type/filebucket_spec.rb +4 -5
  554. data/spec/unit/type/group_spec.rb +6 -8
  555. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  556. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  557. data/spec/unit/type/package_spec.rb +56 -57
  558. data/spec/unit/type/resources_spec.rb +72 -74
  559. data/spec/unit/type/schedule_spec.rb +24 -26
  560. data/spec/unit/type/service_spec.rb +48 -48
  561. data/spec/unit/type/stage_spec.rb +0 -1
  562. data/spec/unit/type/tidy_spec.rb +61 -62
  563. data/spec/unit/type/user_spec.rb +24 -25
  564. data/spec/unit/type/whit_spec.rb +0 -1
  565. data/spec/unit/type_spec.rb +55 -54
  566. data/spec/unit/util/at_fork_spec.rb +18 -19
  567. data/spec/unit/util/autoload_spec.rb +55 -56
  568. data/spec/unit/util/backups_spec.rb +34 -35
  569. data/spec/unit/util/character_encoding_spec.rb +5 -5
  570. data/spec/unit/util/checksums_spec.rb +38 -39
  571. data/spec/unit/util/colors_spec.rb +1 -2
  572. data/spec/unit/util/command_line_spec.rb +24 -25
  573. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  574. data/spec/unit/util/diff_spec.rb +7 -8
  575. data/spec/unit/util/errors_spec.rb +0 -1
  576. data/spec/unit/util/execution_spec.rb +185 -161
  577. data/spec/unit/util/execution_stub_spec.rb +0 -1
  578. data/spec/unit/util/feature_spec.rb +21 -14
  579. data/spec/unit/util/filetype_spec.rb +49 -49
  580. data/spec/unit/util/http_proxy_spec.rb +12 -12
  581. data/spec/unit/util/inifile_spec.rb +26 -31
  582. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  583. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  584. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  585. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  586. data/spec/unit/util/lockfile_spec.rb +0 -1
  587. data/spec/unit/util/log/destinations_spec.rb +30 -33
  588. data/spec/unit/util/log_spec.rb +35 -36
  589. data/spec/unit/util/logging_spec.rb +58 -72
  590. data/spec/unit/util/metric_spec.rb +0 -1
  591. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  592. data/spec/unit/util/multi_match_spec.rb +0 -1
  593. data/spec/unit/util/network_device/config_spec.rb +0 -1
  594. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  595. data/spec/unit/util/network_device_spec.rb +7 -9
  596. data/spec/unit/util/package_spec.rb +0 -1
  597. data/spec/unit/util/pidlock_spec.rb +21 -22
  598. data/spec/unit/util/plist_spec.rb +40 -33
  599. data/spec/unit/util/posix_spec.rb +54 -51
  600. data/spec/unit/util/rdoc_spec.rb +9 -10
  601. data/spec/unit/util/reference_spec.rb +0 -1
  602. data/spec/unit/util/resource_template_spec.rb +20 -20
  603. data/spec/unit/util/retry_action_spec.rb +7 -8
  604. data/spec/unit/util/rubygems_spec.rb +7 -8
  605. data/spec/unit/util/run_mode_spec.rb +3 -4
  606. data/spec/unit/util/selinux_spec.rb +79 -72
  607. data/spec/unit/util/splayer_spec.rb +8 -9
  608. data/spec/unit/util/ssl_spec.rb +0 -1
  609. data/spec/unit/util/storage_spec.rb +3 -4
  610. data/spec/unit/util/suidmanager_spec.rb +45 -54
  611. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  612. data/spec/unit/util/tag_set_spec.rb +0 -1
  613. data/spec/unit/util/tagging_spec.rb +0 -1
  614. data/spec/unit/util/terminal_spec.rb +9 -10
  615. data/spec/unit/util/user_attr_spec.rb +1 -2
  616. data/spec/unit/util/warnings_spec.rb +3 -4
  617. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  618. data/spec/unit/util/watcher_spec.rb +51 -21
  619. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  620. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  621. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  622. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  623. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  624. data/spec/unit/util/windows/file_spec.rb +0 -1
  625. data/spec/unit/util/windows/root_certs_spec.rb +0 -1
  626. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  627. data/spec/unit/util/windows/service_spec.rb +66 -68
  628. data/spec/unit/util/windows/sid_spec.rb +11 -13
  629. data/spec/unit/util/windows/string_spec.rb +0 -1
  630. data/spec/unit/util_spec.rb +55 -57
  631. data/spec/unit/version_spec.rb +6 -6
  632. 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,28 +11,29 @@ 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
- @ssl_host = stub_everything 'ssl host'
28
- Puppet::SSL::Host.stubs(:new).returns(@ssl_host)
26
+ @ssl_host = double('ssl host')
27
+ allow(@ssl_host).to receive(:wait_for_cert)
28
+ allow(Puppet::SSL::Host).to receive(:new).and_return(@ssl_host)
29
29
 
30
- Puppet::Node.indirection.stubs(:terminus_class=)
31
- Puppet::Node.indirection.stubs(:cache_class=)
32
- Puppet::Node::Facts.indirection.stubs(:terminus_class=)
30
+ allow(Puppet::Node.indirection).to receive(:terminus_class=)
31
+ allow(Puppet::Node.indirection).to receive(:cache_class=)
32
+ allow(Puppet::Node::Facts.indirection).to receive(:terminus_class=)
33
33
 
34
- $stderr.expects(:puts).never
34
+ expect($stderr).not_to receive(:puts)
35
35
 
36
- Puppet.settings.stubs(:use)
36
+ allow(Puppet.settings).to receive(:use)
37
37
  end
38
38
 
39
39
  it "should operate in agent run_mode" do
@@ -58,7 +58,7 @@ describe Puppet::Application::Agent do
58
58
 
59
59
  describe "in preinit" do
60
60
  it "should catch INT" do
61
- Signal.expects(:trap).with { |arg,block| arg == :INT }
61
+ expect(Signal).to receive(:trap).with(:INT)
62
62
 
63
63
  @puppetd.preinit
64
64
  end
@@ -96,7 +96,7 @@ describe Puppet::Application::Agent do
96
96
 
97
97
  describe "when handling options" do
98
98
  before do
99
- @puppetd.command_line.stubs(:args).returns([])
99
+ allow(@puppetd.command_line).to receive(:args).and_return([])
100
100
  end
101
101
 
102
102
  [:enable, :debug, :fqdn, :test, :verbose, :digest].each do |option|
@@ -126,39 +126,39 @@ describe Puppet::Application::Agent do
126
126
  end
127
127
 
128
128
  it "should set waitforcert to 0 with --onetime and if --waitforcert wasn't given" do
129
- @agent.stubs(:run).returns(2)
129
+ allow(@agent).to receive(:run).and_return(2)
130
130
  Puppet[:onetime] = true
131
131
 
132
- @ssl_host.expects(:wait_for_cert).with(0)
132
+ expect(@ssl_host).to receive(:wait_for_cert).with(0)
133
133
 
134
134
  expect { execute_agent }.to exit_with 0
135
135
  end
136
136
 
137
137
  it "should use supplied waitforcert when --onetime is specified" do
138
- @agent.stubs(:run).returns(2)
138
+ allow(@agent).to receive(:run).and_return(2)
139
139
  Puppet[:onetime] = true
140
140
  @puppetd.handle_waitforcert(60)
141
141
 
142
- @ssl_host.expects(:wait_for_cert).with(60)
142
+ expect(@ssl_host).to receive(:wait_for_cert).with(60)
143
143
 
144
144
  expect { execute_agent }.to exit_with 0
145
145
  end
146
146
 
147
147
  it "should use a default value for waitforcert when --onetime and --waitforcert are not specified" do
148
- @ssl_host.expects(:wait_for_cert).with(120)
148
+ expect(@ssl_host).to receive(:wait_for_cert).with(120)
149
149
 
150
150
  execute_agent
151
151
  end
152
152
 
153
153
  it "should use the waitforcert setting when checking for a signed certificate" do
154
154
  Puppet[:waitforcert] = 10
155
- @ssl_host.expects(:wait_for_cert).with(10)
155
+ expect(@ssl_host).to receive(:wait_for_cert).with(10)
156
156
 
157
157
  execute_agent
158
158
  end
159
159
 
160
160
  it "should set the log destination with --logdest" do
161
- Puppet::Log.expects(:newdestination).with("console")
161
+ expect(Puppet::Log).to receive(:newdestination).with("console")
162
162
 
163
163
  @puppetd.handle_logdest("console")
164
164
  end
@@ -170,9 +170,9 @@ describe Puppet::Application::Agent do
170
170
  end
171
171
 
172
172
  it "should parse the log destination from the command line" do
173
- @puppetd.command_line.stubs(:args).returns(%w{--logdest /my/file})
173
+ allow(@puppetd.command_line).to receive(:args).and_return(%w{--logdest /my/file})
174
174
 
175
- Puppet::Util::Log.expects(:newdestination).with("/my/file")
175
+ expect(Puppet::Util::Log).to receive(:newdestination).with("/my/file")
176
176
 
177
177
  @puppetd.parse_options
178
178
  end
@@ -186,25 +186,25 @@ describe Puppet::Application::Agent do
186
186
 
187
187
  describe "during setup" do
188
188
  before :each do
189
- Puppet.stubs(:info)
189
+ allow(Puppet).to receive(:info)
190
190
  Puppet[:libdir] = "/dev/null/lib"
191
- Puppet::Transaction::Report.indirection.stubs(:terminus_class=)
192
- Puppet::Transaction::Report.indirection.stubs(:cache_class=)
193
- Puppet::Resource::Catalog.indirection.stubs(:terminus_class=)
194
- Puppet::Resource::Catalog.indirection.stubs(:cache_class=)
195
- Puppet::Node::Facts.indirection.stubs(:terminus_class=)
196
- Puppet.stubs(:settraps)
191
+ allow(Puppet::Transaction::Report.indirection).to receive(:terminus_class=)
192
+ allow(Puppet::Transaction::Report.indirection).to receive(:cache_class=)
193
+ allow(Puppet::Resource::Catalog.indirection).to receive(:terminus_class=)
194
+ allow(Puppet::Resource::Catalog.indirection).to receive(:cache_class=)
195
+ allow(Puppet::Node::Facts.indirection).to receive(:terminus_class=)
196
+ allow(Puppet).to receive(:settraps)
197
197
  end
198
198
 
199
199
  it "should not run with extra arguments" do
200
- @puppetd.command_line.stubs(:args).returns(%w{disable})
200
+ allow(@puppetd.command_line).to receive(:args).and_return(%w{disable})
201
201
  expect{@puppetd.setup}.to raise_error ArgumentError, /does not take parameters/
202
202
  end
203
203
 
204
204
  describe "with --test" do
205
205
  it "should call setup_test" do
206
206
  @puppetd.options[:test] = true
207
- @puppetd.expects(:setup_test)
207
+ expect(@puppetd).to receive(:setup_test)
208
208
 
209
209
  @puppetd.setup
210
210
  end
@@ -227,13 +227,13 @@ describe Puppet::Application::Agent do
227
227
  end
228
228
 
229
229
  it "should call setup_logs" do
230
- @puppetd.expects(:setup_logs)
230
+ expect(@puppetd).to receive(:setup_logs)
231
231
  @puppetd.setup
232
232
  end
233
233
 
234
234
  describe "when setting up logs" do
235
235
  before :each do
236
- Puppet::Util::Log.stubs(:newdestination)
236
+ allow(Puppet::Util::Log).to receive(:newdestination)
237
237
  end
238
238
 
239
239
  it "should set log level to debug if --debug was passed" do
@@ -252,8 +252,8 @@ describe Puppet::Application::Agent do
252
252
  it "should set console as the log destination with level #{level}" do
253
253
  @puppetd.options[level] = true
254
254
 
255
- Puppet::Util::Log.expects(:newdestination).at_least_once
256
- Puppet::Util::Log.expects(:newdestination).with(:console).once
255
+ allow(Puppet::Util::Log).to receive(:newdestination)
256
+ expect(Puppet::Util::Log).to receive(:newdestination).with(:console).exactly(:once)
257
257
 
258
258
  @puppetd.setup_logs
259
259
  end
@@ -262,16 +262,15 @@ describe Puppet::Application::Agent do
262
262
  it "should set a default log destination if no --logdest" do
263
263
  @puppetd.options[:setdest] = false
264
264
 
265
- Puppet::Util::Log.expects(:setup_default)
265
+ expect(Puppet::Util::Log).to receive(:setup_default)
266
266
 
267
267
  @puppetd.setup_logs
268
268
  end
269
-
270
269
  end
271
270
 
272
271
  it "should print puppet config if asked to in Puppet config" do
273
272
  Puppet[:configprint] = "plugindest"
274
- Puppet.settings.expects(:print_configs).returns true
273
+ expect(Puppet.settings).to receive(:print_configs).and_return(true)
275
274
  expect { execute_agent }.to exit_with 0
276
275
  end
277
276
 
@@ -279,32 +278,31 @@ describe Puppet::Application::Agent do
279
278
  path = make_absolute('/my/path')
280
279
  Puppet[:modulepath] = path
281
280
  Puppet[:configprint] = "modulepath"
282
- Puppet::Settings.any_instance.expects(:puts).with(path)
281
+ expect_any_instance_of(Puppet::Settings).to receive(:puts).with(path)
283
282
  expect { execute_agent }.to exit_with 0
284
283
  end
285
284
 
286
285
  it "should use :main, :puppetd, and :ssl" do
287
- Puppet.settings.unstub(:use)
288
- Puppet.settings.expects(:use).with(:main, :agent, :ssl)
286
+ expect(Puppet.settings).to receive(:use).with(:main, :agent, :ssl)
289
287
 
290
288
  @puppetd.setup
291
289
  end
292
290
 
293
291
  it "should setup an agent in fingerprint mode" do
294
292
  @puppetd.options[:fingerprint] = true
295
- @puppetd.expects(:setup_agent).never
293
+ expect(@puppetd).not_to receive(:setup_agent)
296
294
 
297
295
  @puppetd.setup
298
296
  end
299
297
 
300
298
  it "should tell the report handler to use REST" do
301
- Puppet::Transaction::Report.indirection.expects(:terminus_class=).with(:rest)
299
+ expect(Puppet::Transaction::Report.indirection).to receive(:terminus_class=).with(:rest)
302
300
 
303
301
  @puppetd.setup
304
302
  end
305
303
 
306
304
  it "should tell the report handler to cache locally as yaml" do
307
- Puppet::Transaction::Report.indirection.expects(:cache_class=).with(:yaml)
305
+ expect(Puppet::Transaction::Report.indirection).to receive(:cache_class=).with(:yaml)
308
306
 
309
307
  @puppetd.setup
310
308
  end
@@ -320,7 +318,7 @@ describe Puppet::Application::Agent do
320
318
  end
321
319
 
322
320
  it "has an application default :catalog_cache_terminus setting of 'json'" do
323
- Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(:json)
321
+ expect(Puppet::Resource::Catalog.indirection).to receive(:cache_class=).with(:json)
324
322
 
325
323
  @puppetd.initialize_app_defaults
326
324
  @puppetd.setup
@@ -328,7 +326,7 @@ describe Puppet::Application::Agent do
328
326
 
329
327
  it "should tell the catalog cache class based on the :catalog_cache_terminus setting" do
330
328
  Puppet[:catalog_cache_terminus] = "yaml"
331
- Puppet::Resource::Catalog.indirection.expects(:cache_class=).with(:yaml)
329
+ expect(Puppet::Resource::Catalog.indirection).to receive(:cache_class=).with(:yaml)
332
330
 
333
331
  @puppetd.initialize_app_defaults
334
332
  @puppetd.setup
@@ -336,8 +334,7 @@ describe Puppet::Application::Agent do
336
334
 
337
335
  it "should not set catalog cache class if :catalog_cache_terminus is explicitly nil" do
338
336
  Puppet[:catalog_cache_terminus] = nil
339
- Puppet::Resource::Catalog.indirection.unstub(:cache_class=)
340
- Puppet::Resource::Catalog.indirection.expects(:cache_class=).never
337
+ expect(Puppet::Resource::Catalog.indirection).not_to receive(:cache_class=)
341
338
 
342
339
  @puppetd.initialize_app_defaults
343
340
  @puppetd.setup
@@ -349,7 +346,7 @@ describe Puppet::Application::Agent do
349
346
  end
350
347
 
351
348
  it "should create an agent" do
352
- Puppet::Agent.stubs(:new).with(Puppet::Configurer)
349
+ allow(Puppet::Agent).to receive(:new).with(Puppet::Configurer)
353
350
 
354
351
  @puppetd.setup
355
352
  end
@@ -357,7 +354,7 @@ describe Puppet::Application::Agent do
357
354
  [:enable, :disable].each do |action|
358
355
  it "should delegate to enable_disable_client if we #{action} the agent" do
359
356
  @puppetd.options[action] = true
360
- @puppetd.expects(:enable_disable_client).with(@agent)
357
+ expect(@puppetd).to receive(:enable_disable_client).with(@agent)
361
358
 
362
359
  @puppetd.setup
363
360
  end
@@ -367,7 +364,7 @@ describe Puppet::Application::Agent do
367
364
  [:enable, :disable].each do |action|
368
365
  it "should call client.#{action}" do
369
366
  @puppetd.options[action] = true
370
- @agent.expects(action)
367
+ expect(@agent).to receive(action)
371
368
  expect { execute_agent }.to exit_with 0
372
369
  end
373
370
  end
@@ -375,7 +372,7 @@ describe Puppet::Application::Agent do
375
372
  it "should pass the disable message when disabling" do
376
373
  @puppetd.options[:disable] = true
377
374
  @puppetd.options[:disable_message] = "message"
378
- @agent.expects(:disable).with("message")
375
+ expect(@agent).to receive(:disable).with("message")
379
376
 
380
377
  expect { execute_agent }.to exit_with 0
381
378
  end
@@ -383,7 +380,7 @@ describe Puppet::Application::Agent do
383
380
  it "should pass the default disable message when disabling without a message" do
384
381
  @puppetd.options[:disable] = true
385
382
  @puppetd.options[:disable_message] = nil
386
- @agent.expects(:disable).with("reason not specified")
383
+ expect(@agent).to receive(:disable).with("reason not specified")
387
384
 
388
385
  expect { execute_agent }.to exit_with 0
389
386
  end
@@ -398,18 +395,18 @@ describe Puppet::Application::Agent do
398
395
  end
399
396
 
400
397
  it "should daemonize if needed" do
401
- Puppet::Util::Platform.stubs(:windows?).returns false
398
+ allow(Puppet::Util::Platform).to receive(:windows?).and_return(false)
402
399
  Puppet[:daemonize] = true
403
- Signal.stubs(:trap)
400
+ allow(Signal).to receive(:trap)
404
401
 
405
- @daemon.expects(:daemonize)
402
+ expect(@daemon).to receive(:daemonize)
406
403
 
407
404
  execute_agent
408
405
  end
409
406
 
410
407
  it "should wait for a certificate" do
411
408
  @puppetd.options[:waitforcert] = 123
412
- @ssl_host.expects(:wait_for_cert).with(123)
409
+ expect(@ssl_host).to receive(:wait_for_cert).with(123)
413
410
 
414
411
  execute_agent
415
412
  end
@@ -419,12 +416,12 @@ describe Puppet::Application::Agent do
419
416
  @puppetd.options[:waitforcert] = 123
420
417
  @puppetd.options[:digest] = 'MD5'
421
418
 
422
- certificate = mock 'certificate'
423
- certificate.stubs(:digest).with('MD5').returns('ABCDE')
424
- @ssl_host.stubs(:certificate).returns(certificate)
419
+ certificate = double('certificate')
420
+ allow(certificate).to receive(:digest).with('MD5').and_return('ABCDE')
421
+ allow(@ssl_host).to receive(:certificate).and_return(certificate)
425
422
 
426
- @ssl_host.expects(:wait_for_cert).never
427
- @puppetd.expects(:puts).with('ABCDE')
423
+ expect(@ssl_host).not_to receive(:wait_for_cert)
424
+ expect(@puppetd).to receive(:puts).with('ABCDE')
428
425
 
429
426
  execute_agent
430
427
  end
@@ -435,36 +432,35 @@ describe Puppet::Application::Agent do
435
432
  end
436
433
 
437
434
  it "should not setup as an agent" do
438
- @puppetd.expects(:setup_agent).never
435
+ expect(@puppetd).not_to receive(:setup_agent)
439
436
  @puppetd.setup
440
437
  end
441
438
 
442
439
  it "should not create an agent" do
443
- Puppet::Agent.stubs(:new).with(Puppet::Configurer).never
440
+ expect(Puppet::Agent).not_to receive(:new).with(Puppet::Configurer)
444
441
  @puppetd.setup
445
442
  end
446
443
 
447
444
  it "should not daemonize" do
448
- @daemon.expects(:daemonize).never
445
+ expect(@daemon).not_to receive(:daemonize)
449
446
  @puppetd.setup
450
447
  end
451
448
  end
452
449
 
453
450
  describe "when configuring agent for catalog run" do
454
451
  it "should set should_fork as true when running normally" do
455
- Puppet::Agent.expects(:new).with(anything, true)
452
+ expect(Puppet::Agent).to receive(:new).with(anything, true)
456
453
  @puppetd.setup
457
454
  end
458
455
 
459
456
  it "should not set should_fork as false for --onetime" do
460
457
  Puppet[:onetime] = true
461
- Puppet::Agent.expects(:new).with(anything, false)
458
+ expect(Puppet::Agent).to receive(:new).with(anything, false)
462
459
  @puppetd.setup
463
460
  end
464
461
  end
465
462
  end
466
463
 
467
-
468
464
  describe "when running" do
469
465
  before :each do
470
466
  @puppetd.options[:fingerprint] = false
@@ -473,7 +469,7 @@ describe Puppet::Application::Agent do
473
469
  it "should dispatch to fingerprint if --fingerprint is used" do
474
470
  @puppetd.options[:fingerprint] = true
475
471
 
476
- @puppetd.stubs(:fingerprint)
472
+ allow(@puppetd).to receive(:fingerprint)
477
473
 
478
474
  execute_agent
479
475
  end
@@ -481,7 +477,7 @@ describe Puppet::Application::Agent do
481
477
  it "should dispatch to onetime if --onetime is used" do
482
478
  @puppetd.options[:onetime] = true
483
479
 
484
- @puppetd.stubs(:onetime)
480
+ allow(@puppetd).to receive(:onetime)
485
481
 
486
482
  execute_agent
487
483
  end
@@ -489,41 +485,40 @@ describe Puppet::Application::Agent do
489
485
  it "should dispatch to main if --onetime and --fingerprint are not used" do
490
486
  @puppetd.options[:onetime] = false
491
487
 
492
- @puppetd.stubs(:main)
488
+ allow(@puppetd).to receive(:main)
493
489
 
494
490
  execute_agent
495
491
  end
496
492
 
497
493
  describe "with --onetime" do
498
-
499
494
  before :each do
500
- @agent.stubs(:run).returns(:report)
495
+ allow(@agent).to receive(:run).and_return(:report)
501
496
  Puppet[:onetime] = true
502
497
  @puppetd.options[:client] = :client
503
498
  @puppetd.options[:detailed_exitcodes] = false
504
499
  end
505
500
 
506
501
  it "should setup traps" do
507
- @daemon.expects(:set_signal_traps)
502
+ expect(@daemon).to receive(:set_signal_traps)
508
503
 
509
504
  expect { execute_agent }.to exit_with 0
510
505
  end
511
506
 
512
507
  it "should let the agent run" do
513
- @agent.expects(:run).returns(:report)
508
+ expect(@agent).to receive(:run).and_return(:report)
514
509
 
515
510
  expect { execute_agent }.to exit_with 0
516
511
  end
517
512
 
518
513
  it "should run the agent with the supplied job_id" do
519
514
  @puppetd.options[:job_id] = 'special id'
520
- @agent.expects(:run).with(:job_id => 'special id').returns(:report)
515
+ expect(@agent).to receive(:run).with(:job_id => 'special id').and_return(:report)
521
516
 
522
517
  expect { execute_agent }.to exit_with 0
523
518
  end
524
519
 
525
520
  it "should stop the daemon" do
526
- @daemon.expects(:stop).with(:exit => false)
521
+ expect(@daemon).to receive(:stop).with(:exit => false)
527
522
 
528
523
  expect { execute_agent }.to exit_with 0
529
524
  end
@@ -535,14 +530,14 @@ describe Puppet::Application::Agent do
535
530
 
536
531
  it "should exit with agent computed exit status" do
537
532
  Puppet[:noop] = false
538
- @agent.stubs(:run).returns(666)
533
+ allow(@agent).to receive(:run).and_return(666)
539
534
 
540
535
  expect { execute_agent }.to exit_with 666
541
536
  end
542
537
 
543
538
  it "should exit with the agent's exit status, even if --noop is set." do
544
539
  Puppet[:noop] = true
545
- @agent.stubs(:run).returns(666)
540
+ allow(@agent).to receive(:run).and_return(666)
546
541
 
547
542
  expect { execute_agent }.to exit_with 666
548
543
  end
@@ -551,26 +546,26 @@ describe Puppet::Application::Agent do
551
546
 
552
547
  describe "with --fingerprint" do
553
548
  before :each do
554
- @cert = mock 'cert'
549
+ @cert = double('cert')
555
550
  @puppetd.options[:fingerprint] = true
556
551
  @puppetd.options[:digest] = :MD5
557
552
  end
558
553
 
559
554
  it "should fingerprint the certificate if it exists" do
560
- @ssl_host.stubs(:certificate).returns(@cert)
561
- @cert.stubs(:digest).with('MD5').returns "fingerprint"
555
+ allow(@ssl_host).to receive(:certificate).and_return(@cert)
556
+ allow(@cert).to receive(:digest).with('MD5').and_return("fingerprint")
562
557
 
563
- @puppetd.expects(:puts).with "fingerprint"
558
+ expect(@puppetd).to receive(:puts).with("fingerprint")
564
559
 
565
560
  @puppetd.fingerprint
566
561
  end
567
562
 
568
563
  it "should fingerprint the certificate request if no certificate have been signed" do
569
- @ssl_host.stubs(:certificate).returns(nil)
570
- @ssl_host.stubs(:certificate_request).returns(@cert)
571
- @cert.stubs(:digest).with('MD5').returns "fingerprint"
564
+ allow(@ssl_host).to receive(:certificate).and_return(nil)
565
+ allow(@ssl_host).to receive(:certificate_request).and_return(@cert)
566
+ allow(@cert).to receive(:digest).with('MD5').and_return("fingerprint")
572
567
 
573
- @puppetd.expects(:puts).with "fingerprint"
568
+ expect(@puppetd).to receive(:puts).with("fingerprint")
574
569
 
575
570
  @puppetd.fingerprint
576
571
  end
@@ -578,11 +573,11 @@ describe Puppet::Application::Agent do
578
573
 
579
574
  describe "without --onetime and --fingerprint" do
580
575
  before :each do
581
- Puppet.stubs(:notice)
576
+ allow(Puppet).to receive(:notice)
582
577
  end
583
578
 
584
579
  it "should start our daemon" do
585
- @daemon.expects(:start)
580
+ expect(@daemon).to receive(:start)
586
581
 
587
582
  execute_agent
588
583
  end