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
data/spec/spec_helper.rb CHANGED
@@ -77,7 +77,14 @@ RSpec.configure do |config|
77
77
  exclude_filters[:benchmark] = true unless ENV['BENCHMARK']
78
78
  config.filter_run_excluding exclude_filters
79
79
 
80
- config.mock_with :mocha
80
+ config.filter_run_when_matching :focus
81
+
82
+ config.mock_with :rspec do |mocks|
83
+ # We really should have this on, but it breaks a _lot_ of tests. We'll
84
+ # need to go through and fix those tests first before it can be enabled
85
+ # for real.
86
+ mocks.verify_partial_doubles = false
87
+ end
81
88
 
82
89
  tmpdir = Puppet::FileSystem.expand_path(Dir.mktmpdir("rspecrun"))
83
90
  oldtmpdir = Puppet::FileSystem.expand_path(Dir.tmpdir())
@@ -122,6 +129,7 @@ RSpec.configure do |config|
122
129
  # redirecting logging away from console, because otherwise the test output will be
123
130
  # obscured by all of the log output
124
131
  @logs = []
132
+ Puppet::Util::Log.close_all
125
133
  if ENV["PUPPET_TEST_LOG_LEVEL"]
126
134
  Puppet::Util::Log.level = ENV["PUPPET_TEST_LOG_LEVEL"].intern
127
135
  end
@@ -151,6 +159,7 @@ RSpec.configure do |config|
151
159
  Puppet::Test::TestHelper.after_each_test()
152
160
 
153
161
  # TODO: would like to move this into puppetlabs_spec_helper, but there are namespace issues at the moment.
162
+ allow(Dir).to receive(:entries).and_call_original
154
163
  PuppetSpec::Files.cleanup
155
164
 
156
165
  # TODO: this should be abstracted in the future--see comments above the '@logs' block in the
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/agent'
4
3
  require 'puppet/agent/locker'
@@ -27,7 +26,7 @@ describe Puppet::Agent::Disabler do
27
26
  lockfile = File.expand_path("/my/lock.disabled")
28
27
  Puppet[:agent_disabled_lockfile] = lockfile
29
28
  lock = Puppet::Util::JsonLockfile.new(lockfile)
30
- Puppet::Util::JsonLockfile.expects(:new).with(lockfile).returns lock
29
+ expect(Puppet::Util::JsonLockfile).to receive(:new).with(lockfile).and_return(lock)
31
30
 
32
31
  @disabler.send(:disable_lockfile)
33
32
  end
@@ -37,19 +36,19 @@ describe Puppet::Agent::Disabler do
37
36
  end
38
37
 
39
38
  it "should lock the file when disabled" do
40
- @disabler.send(:disable_lockfile).expects(:lock)
39
+ expect(@disabler.send(:disable_lockfile)).to receive(:lock)
41
40
 
42
41
  @disabler.disable
43
42
  end
44
43
 
45
44
  it "should unlock the file when enabled" do
46
- @disabler.send(:disable_lockfile).expects(:unlock)
45
+ expect(@disabler.send(:disable_lockfile)).to receive(:unlock)
47
46
 
48
47
  @disabler.enable
49
48
  end
50
49
 
51
50
  it "should check the lock if it is disabled" do
52
- @disabler.send(:disable_lockfile).expects(:locked?)
51
+ expect(@disabler.send(:disable_lockfile)).to receive(:locked?)
53
52
 
54
53
  @disabler.disabled?
55
54
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/agent'
4
3
  require 'puppet/agent/locker'
@@ -27,7 +26,7 @@ describe Puppet::Agent::Locker do
27
26
  lockfile = File.expand_path("/my/lock")
28
27
  Puppet[:agent_catalog_run_lockfile] = lockfile
29
28
  lock = Puppet::Util::Pidlock.new(lockfile)
30
- Puppet::Util::Pidlock.expects(:new).with(lockfile).returns lock
29
+ expect(Puppet::Util::Pidlock).to receive(:new).with(lockfile).and_return(lock)
31
30
 
32
31
  @locker.send(:lockfile)
33
32
  end
@@ -43,7 +42,7 @@ describe Puppet::Agent::Locker do
43
42
  end
44
43
 
45
44
  it "should have a method that yields when a lock is attained" do
46
- @locker.send(:lockfile).expects(:lock).returns true
45
+ expect(@locker.send(:lockfile)).to receive(:lock).and_return(true)
47
46
 
48
47
  yielded = false
49
48
  @locker.lock do
@@ -53,19 +52,19 @@ describe Puppet::Agent::Locker do
53
52
  end
54
53
 
55
54
  it "should return the block result when the lock method successfully locked" do
56
- @locker.send(:lockfile).expects(:lock).returns true
55
+ expect(@locker.send(:lockfile)).to receive(:lock).and_return(true)
57
56
 
58
57
  expect(@locker.lock { :result }).to eq(:result)
59
58
  end
60
59
 
61
60
  it "should raise LockError when the lock method does not receive the lock" do
62
- @locker.send(:lockfile).expects(:lock).returns false
61
+ expect(@locker.send(:lockfile)).to receive(:lock).and_return(false)
63
62
 
64
63
  expect { @locker.lock {} }.to raise_error(Puppet::LockError)
65
64
  end
66
65
 
67
66
  it "should not yield when the lock method does not receive the lock" do
68
- @locker.send(:lockfile).expects(:lock).returns false
67
+ expect(@locker.send(:lockfile)).to receive(:lock).and_return(false)
69
68
 
70
69
  yielded = false
71
70
  expect { @locker.lock { yielded = true } }.to raise_error(Puppet::LockError)
@@ -73,28 +72,28 @@ describe Puppet::Agent::Locker do
73
72
  end
74
73
 
75
74
  it "should not unlock when a lock was not received" do
76
- @locker.send(:lockfile).expects(:lock).returns false
77
- @locker.send(:lockfile).expects(:unlock).never
75
+ expect(@locker.send(:lockfile)).to receive(:lock).and_return(false)
76
+ expect(@locker.send(:lockfile)).not_to receive(:unlock)
78
77
 
79
78
  expect { @locker.lock {} }.to raise_error(Puppet::LockError)
80
79
  end
81
80
 
82
81
  it "should unlock after yielding upon obtaining a lock" do
83
- @locker.send(:lockfile).stubs(:lock).returns true
84
- @locker.send(:lockfile).expects(:unlock)
82
+ allow(@locker.send(:lockfile)).to receive(:lock).and_return(true)
83
+ expect(@locker.send(:lockfile)).to receive(:unlock)
85
84
 
86
85
  @locker.lock {}
87
86
  end
88
87
 
89
88
  it "should unlock after yielding upon obtaining a lock, even if the block throws an exception" do
90
- @locker.send(:lockfile).stubs(:lock).returns true
91
- @locker.send(:lockfile).expects(:unlock)
89
+ allow(@locker.send(:lockfile)).to receive(:lock).and_return(true)
90
+ expect(@locker.send(:lockfile)).to receive(:unlock)
92
91
 
93
92
  expect { @locker.lock { raise "foo" } }.to raise_error(RuntimeError)
94
93
  end
95
94
 
96
95
  it "should be considered running if the lockfile is locked" do
97
- @locker.send(:lockfile).expects(:locked?).returns true
96
+ expect(@locker.send(:lockfile)).to receive(:locked?).and_return(true)
98
97
  expect(@locker).to be_running
99
98
  end
100
99
  end
@@ -1,4 +1,3 @@
1
- #! /usr/bin/env ruby
2
1
  require 'spec_helper'
3
2
  require 'puppet/agent'
4
3
  require 'puppet/configurer'
@@ -21,16 +20,13 @@ end
21
20
 
22
21
  describe Puppet::Agent do
23
22
  before do
24
- Puppet::Status.indirection.stubs(:find).returns Puppet::Status.new("version" => Puppet.version)
23
+ allow(Puppet::Status.indirection).to receive(:find).and_return(Puppet::Status.new("version" => Puppet.version))
25
24
 
26
25
  @agent = Puppet::Agent.new(AgentTestClient, false)
27
26
 
28
- # So we don't actually try to hit the filesystem.
29
- @agent.stubs(:lock).yields
30
-
31
27
  # make Puppet::Application safe for stubbing; restore in an :after block; silence warnings for this.
32
28
  without_warnings { Puppet::Application = Class.new(Puppet::Application) }
33
- Puppet::Application.stubs(:clear?).returns(true)
29
+ allow(Puppet::Application).to receive(:clear?).and_return(true)
34
30
  Puppet::Application.class_eval do
35
31
  class << self
36
32
  def controlled_run(&block)
@@ -54,133 +50,132 @@ describe Puppet::Agent do
54
50
  end
55
51
 
56
52
  it "should create an instance of its client class and run it when asked to run" do
57
- client = mock 'client'
58
- AgentTestClient.expects(:new).returns client
53
+ client = double('client')
54
+ expect(AgentTestClient).to receive(:new).and_return(client)
59
55
 
60
- client.expects(:run)
56
+ expect(client).to receive(:run)
61
57
 
62
- @agent.stubs(:disabled?).returns false
58
+ allow(@agent).to receive(:disabled?).and_return(false)
63
59
  @agent.run
64
60
  end
65
61
 
66
62
  it "should initialize the client's transaction_uuid if passed as a client_option" do
67
- client = mock 'client'
63
+ client = double('client')
68
64
  transaction_uuid = 'foo'
69
- AgentTestClient.expects(:new).with(transaction_uuid, nil).returns client
65
+ expect(AgentTestClient).to receive(:new).with(transaction_uuid, nil).and_return(client)
70
66
 
71
- client.expects(:run)
67
+ expect(client).to receive(:run)
72
68
 
73
- @agent.stubs(:disabled?).returns false
69
+ allow(@agent).to receive(:disabled?).and_return(false)
74
70
  @agent.run(:transaction_uuid => transaction_uuid)
75
71
  end
76
72
 
77
73
  it "should initialize the client's job_id if passed as a client_option" do
78
- client = mock 'client'
74
+ client = double('client')
79
75
  job_id = '289'
80
- AgentTestClient.expects(:new).with(anything, job_id).returns client
76
+ expect(AgentTestClient).to receive(:new).with(anything, job_id).and_return(client)
81
77
 
82
- client.expects(:run)
78
+ expect(client).to receive(:run)
83
79
 
84
- @agent.stubs(:disabled?).returns false
80
+ allow(@agent).to receive(:disabled?).and_return(false)
85
81
  @agent.run(:job_id => job_id)
86
82
  end
87
83
 
88
84
  it "should be considered running if the lock file is locked" do
89
- lockfile = mock 'lockfile'
85
+ lockfile = double('lockfile')
90
86
 
91
- @agent.expects(:lockfile).returns(lockfile)
92
- lockfile.expects(:locked?).returns true
87
+ expect(@agent).to receive(:lockfile).and_return(lockfile)
88
+ expect(lockfile).to receive(:locked?).and_return(true)
93
89
 
94
90
  expect(@agent).to be_running
95
91
  end
96
92
 
97
93
  describe "when being run" do
98
94
  before do
99
- AgentTestClient.stubs(:lockfile_path).returns "/my/lock"
100
- @agent.stubs(:disabled?).returns false
95
+ allow(AgentTestClient).to receive(:lockfile_path).and_return("/my/lock")
96
+ allow(@agent).to receive(:disabled?).and_return(false)
101
97
  end
102
98
 
103
99
  it "should splay" do
104
- @agent.expects(:splay)
100
+ expect(@agent).to receive(:splay)
105
101
 
106
102
  @agent.run
107
103
  end
108
104
 
109
105
  it "should do nothing if disabled" do
110
- @agent.expects(:disabled?).returns(true)
111
- AgentTestClient.expects(:new).never
106
+ expect(@agent).to receive(:disabled?).and_return(true)
107
+ expect(AgentTestClient).not_to receive(:new)
112
108
  @agent.run
113
109
  end
114
110
 
115
111
  it "(#11057) should notify the user about why a run is skipped" do
116
- Puppet::Application.stubs(:controlled_run).returns(false)
117
- Puppet::Application.stubs(:run_status).returns('MOCK_RUN_STATUS')
112
+ allow(Puppet::Application).to receive(:controlled_run).and_return(false)
113
+ allow(Puppet::Application).to receive(:run_status).and_return('MOCK_RUN_STATUS')
118
114
  # This is the actual test that we inform the user why the run is skipped.
119
115
  # We assume this information is contained in
120
116
  # Puppet::Application.run_status
121
- Puppet.expects(:notice).with(regexp_matches(/MOCK_RUN_STATUS/))
117
+ expect(Puppet).to receive(:notice).with(/MOCK_RUN_STATUS/)
122
118
  @agent.run
123
119
  end
124
120
 
125
121
  it "should display an informative message if the agent is administratively disabled" do
126
- @agent.expects(:disabled?).returns true
127
- @agent.expects(:disable_message).returns "foo"
128
- Puppet.expects(:notice).with(regexp_matches(/Skipping run of .*; administratively disabled.*\(Reason: 'foo'\)/))
122
+ expect(@agent).to receive(:disabled?).and_return(true)
123
+ expect(@agent).to receive(:disable_message).and_return("foo")
124
+ expect(Puppet).to receive(:notice).with(/Skipping run of .*; administratively disabled.*\(Reason: 'foo'\)/)
129
125
  @agent.run
130
126
  end
131
127
 
132
128
  it "should use Puppet::Application.controlled_run to manage process state behavior" do
133
- calls = sequence('calls')
134
- Puppet::Application.expects(:controlled_run).yields.in_sequence(calls)
135
- AgentTestClient.expects(:new).once.in_sequence(calls)
129
+ expect(Puppet::Application).to receive(:controlled_run).ordered.and_yield
130
+ expect(AgentTestClient).to receive(:new).ordered.once
136
131
  @agent.run
137
132
  end
138
133
 
139
134
  it "should not fail if a client class instance cannot be created" do
140
- AgentTestClient.expects(:new).raises "eh"
141
- Puppet.expects(:log_exception)
135
+ expect(AgentTestClient).to receive(:new).and_raise("eh")
136
+ expect(Puppet).to receive(:log_exception)
142
137
  @agent.run
143
138
  end
144
139
 
145
140
  it "should not fail if there is an exception while running its client" do
146
141
  client = AgentTestClient.new
147
- AgentTestClient.expects(:new).returns client
148
- client.expects(:run).raises "eh"
149
- Puppet.expects(:log_exception)
142
+ expect(AgentTestClient).to receive(:new).and_return(client)
143
+ expect(client).to receive(:run).and_raise("eh")
144
+ expect(Puppet).to receive(:log_exception)
150
145
  @agent.run
151
146
  end
152
147
 
153
148
  it "should use a filesystem lock to restrict multiple processes running the agent" do
154
149
  client = AgentTestClient.new
155
- AgentTestClient.expects(:new).returns client
150
+ expect(AgentTestClient).to receive(:new).and_return(client)
156
151
 
157
- @agent.expects(:lock)
152
+ expect(@agent).to receive(:lock)
158
153
 
159
- client.expects(:run).never # if it doesn't run, then we know our yield is what triggers it
154
+ expect(client).not_to receive(:run) # if it doesn't run, then we know our yield is what triggers it
160
155
  @agent.run
161
156
  end
162
157
 
163
158
  it "should make its client instance available while running" do
164
159
  client = AgentTestClient.new
165
- AgentTestClient.expects(:new).returns client
160
+ expect(AgentTestClient).to receive(:new).and_return(client)
166
161
 
167
- client.expects(:run).with { expect(@agent.client).to equal(client); true }
162
+ expect(client).to receive(:run) { expect(@agent.client).to equal(client); nil }
168
163
  @agent.run
169
164
  end
170
165
 
171
166
  it "should run the client instance with any arguments passed to it" do
172
167
  client = AgentTestClient.new
173
- AgentTestClient.expects(:new).returns client
168
+ expect(AgentTestClient).to receive(:new).and_return(client)
174
169
 
175
- client.expects(:run).with(:pluginsync => true, :other => :options)
170
+ expect(client).to receive(:run).with(:pluginsync => true, :other => :options)
176
171
  @agent.run(:other => :options)
177
172
  end
178
173
 
179
174
  it "should return the agent result" do
180
175
  client = AgentTestClient.new
181
- AgentTestClient.expects(:new).returns client
176
+ expect(AgentTestClient).to receive(:new).and_return(client)
182
177
 
183
- @agent.expects(:lock).returns(:result)
178
+ expect(@agent).to receive(:lock).and_return(:result)
184
179
  expect(@agent.run).to eq(:result)
185
180
  end
186
181
 
@@ -189,63 +184,63 @@ describe Puppet::Agent do
189
184
  @agent = Puppet::Agent.new(AgentTestClient, true)
190
185
 
191
186
  # So we don't actually try to hit the filesystem.
192
- @agent.stubs(:lock).yields
187
+ allow(@agent).to receive(:lock).and_yield
193
188
 
194
- Kernel.stubs(:fork)
195
- Process.stubs(:waitpid2).returns [123, (stub 'process::status', :exitstatus => 0)]
196
- @agent.stubs(:exit)
189
+ allow(Kernel).to receive(:fork)
190
+ allow(Process).to receive(:waitpid2).and_return([123, double('process::status', :exitstatus => 0)])
191
+ allow(@agent).to receive(:exit)
197
192
  end
198
193
 
199
194
  it "should run the agent in a forked process" do
200
195
  client = AgentTestClient.new
201
- AgentTestClient.expects(:new).returns client
196
+ expect(AgentTestClient).to receive(:new).and_return(client)
202
197
 
203
- client.expects(:run)
198
+ expect(client).to receive(:run)
204
199
 
205
- Kernel.expects(:fork).yields
200
+ expect(Kernel).to receive(:fork).and_yield
206
201
  @agent.run
207
202
  end
208
203
 
209
204
  it "should exit child process if child exit" do
210
205
  client = AgentTestClient.new
211
- AgentTestClient.expects(:new).returns client
206
+ expect(AgentTestClient).to receive(:new).and_return(client)
212
207
 
213
- client.expects(:run).raises(SystemExit)
208
+ expect(client).to receive(:run).and_raise(SystemExit)
214
209
 
215
- Kernel.expects(:fork).yields
216
- @agent.expects(:exit).with(-1)
210
+ expect(Kernel).to receive(:fork).and_yield
211
+ expect(@agent).to receive(:exit).with(-1)
217
212
  @agent.run
218
213
  end
219
214
 
220
215
  it 'should exit with 1 if an exception is raised' do
221
216
  client = AgentTestClient.new
222
- AgentTestClient.expects(:new).returns client
217
+ expect(AgentTestClient).to receive(:new).and_return(client)
223
218
 
224
- client.expects(:run).raises(StandardError)
219
+ expect(client).to receive(:run).and_raise(StandardError)
225
220
 
226
- Kernel.expects(:fork).yields
227
- @agent.expects(:exit).with(1)
221
+ expect(Kernel).to receive(:fork).and_yield
222
+ expect(@agent).to receive(:exit).with(1)
228
223
  @agent.run
229
224
  end
230
225
 
231
226
  it "should re-raise exit happening in the child" do
232
- Process.stubs(:waitpid2).returns [123, (stub 'process::status', :exitstatus => -1)]
227
+ allow(Process).to receive(:waitpid2).and_return([123, double('process::status', :exitstatus => -1)])
233
228
  expect { @agent.run }.to raise_error(SystemExit)
234
229
  end
235
230
 
236
231
  it "should re-raise NoMoreMemory happening in the child" do
237
- Process.stubs(:waitpid2).returns [123, (stub 'process::status', :exitstatus => -2)]
232
+ allow(Process).to receive(:waitpid2).and_return([123, double('process::status', :exitstatus => -2)])
238
233
  expect { @agent.run }.to raise_error(NoMemoryError)
239
234
  end
240
235
 
241
236
  it "should return the child exit code" do
242
- Process.stubs(:waitpid2).returns [123, (stub 'process::status', :exitstatus => 777)]
237
+ allow(Process).to receive(:waitpid2).and_return([123, double('process::status', :exitstatus => 777)])
243
238
  expect(@agent.run).to eq(777)
244
239
  end
245
240
 
246
241
  it "should return the block exit code as the child exit code" do
247
- Kernel.expects(:fork).yields
248
- @agent.expects(:exit).with(777)
242
+ expect(Kernel).to receive(:fork).and_yield
243
+ expect(@agent).to receive(:exit).with(777)
249
244
  @agent.run_in_fork {
250
245
  777
251
246
  }
@@ -282,11 +277,11 @@ describe Puppet::Agent do
282
277
  end
283
278
  end
284
279
 
285
- AgentTestClient.expects(:new).returns client
280
+ expect(AgentTestClient).to receive(:new).and_return(client)
286
281
 
287
- client.expects(:processing).never
288
- client.expects(:handling).never
289
- Puppet.expects(:log_exception).with(instance_of(Puppet::Agent::RunTimeoutError), anything)
282
+ expect(client).not_to receive(:processing)
283
+ expect(client).not_to receive(:handling)
284
+ expect(Puppet).to receive(:log_exception).with(be_an_instance_of(Puppet::Agent::RunTimeoutError), anything)
290
285
 
291
286
  expect(@agent.run).to eq(1)
292
287
  end
@@ -296,10 +291,10 @@ describe Puppet::Agent do
296
291
  describe "when checking execution state" do
297
292
  describe 'with regular run status' do
298
293
  before :each do
299
- Puppet::Application.stubs(:restart_requested?).returns(false)
300
- Puppet::Application.stubs(:stop_requested?).returns(false)
301
- Puppet::Application.stubs(:interrupted?).returns(false)
302
- Puppet::Application.stubs(:clear?).returns(true)
294
+ allow(Puppet::Application).to receive(:restart_requested?).and_return(false)
295
+ allow(Puppet::Application).to receive(:stop_requested?).and_return(false)
296
+ allow(Puppet::Application).to receive(:interrupted?).and_return(false)
297
+ allow(Puppet::Application).to receive(:clear?).and_return(true)
303
298
  end
304
299
 
305
300
  it 'should be false for :stopping?' do
@@ -313,10 +308,10 @@ describe Puppet::Agent do
313
308
 
314
309
  describe 'with a stop requested' do
315
310
  before :each do
316
- Puppet::Application.stubs(:clear?).returns(false)
317
- Puppet::Application.stubs(:restart_requested?).returns(false)
318
- Puppet::Application.stubs(:stop_requested?).returns(true)
319
- Puppet::Application.stubs(:interrupted?).returns(true)
311
+ allow(Puppet::Application).to receive(:clear?).and_return(false)
312
+ allow(Puppet::Application).to receive(:restart_requested?).and_return(false)
313
+ allow(Puppet::Application).to receive(:stop_requested?).and_return(true)
314
+ allow(Puppet::Application).to receive(:interrupted?).and_return(true)
320
315
  end
321
316
 
322
317
  it 'should be true for :stopping?' do
@@ -330,10 +325,10 @@ describe Puppet::Agent do
330
325
 
331
326
  describe 'with a restart requested' do
332
327
  before :each do
333
- Puppet::Application.stubs(:clear?).returns(false)
334
- Puppet::Application.stubs(:restart_requested?).returns(true)
335
- Puppet::Application.stubs(:stop_requested?).returns(false)
336
- Puppet::Application.stubs(:interrupted?).returns(true)
328
+ allow(Puppet::Application).to receive(:clear?).and_return(false)
329
+ allow(Puppet::Application).to receive(:restart_requested?).and_return(true)
330
+ allow(Puppet::Application).to receive(:stop_requested?).and_return(false)
331
+ allow(Puppet::Application).to receive(:interrupted?).and_return(true)
337
332
  end
338
333
 
339
334
  it 'should be false for :stopping?' do