puppet 6.4.0-x64-mingw32 → 6.4.1-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of puppet might be problematic. Click here for more details.

Files changed (646) hide show
  1. checksums.yaml +4 -4
  2. data/Gemfile +0 -1
  3. data/Gemfile.lock +7 -11
  4. data/lib/puppet/application/device.rb +97 -82
  5. data/lib/puppet/application/filebucket.rb +4 -0
  6. data/lib/puppet/application/ssl.rb +2 -2
  7. data/lib/puppet/configurer.rb +5 -4
  8. data/lib/puppet/defaults.rb +33 -11
  9. data/lib/puppet/indirector/request.rb +28 -15
  10. data/lib/puppet/ssl.rb +1 -1
  11. data/lib/puppet/ssl/certificate.rb +1 -1
  12. data/lib/puppet/ssl/error.rb +1 -1
  13. data/lib/puppet/ssl/host.rb +0 -47
  14. data/lib/puppet/ssl/ssl_provider.rb +2 -2
  15. data/lib/puppet/ssl/state_machine.rb +16 -17
  16. data/lib/puppet/ssl/validator/default_validator.rb +4 -4
  17. data/lib/puppet/ssl/verifier.rb +1 -1
  18. data/lib/puppet/transaction/event_manager.rb +1 -5
  19. data/lib/puppet/util/connection.rb +15 -8
  20. data/lib/puppet/util/monkey_patches.rb +20 -1
  21. data/lib/puppet/version.rb +1 -1
  22. data/locales/puppet.pot +135 -68
  23. data/man/man5/puppet.conf.5 +9 -9
  24. data/man/man8/puppet-agent.8 +1 -1
  25. data/man/man8/puppet-apply.8 +1 -1
  26. data/man/man8/puppet-catalog.8 +1 -1
  27. data/man/man8/puppet-config.8 +1 -1
  28. data/man/man8/puppet-describe.8 +1 -1
  29. data/man/man8/puppet-device.8 +1 -1
  30. data/man/man8/puppet-doc.8 +1 -1
  31. data/man/man8/puppet-epp.8 +1 -1
  32. data/man/man8/puppet-facts.8 +1 -1
  33. data/man/man8/puppet-filebucket.8 +1 -1
  34. data/man/man8/puppet-generate.8 +1 -1
  35. data/man/man8/puppet-help.8 +1 -1
  36. data/man/man8/puppet-key.8 +1 -1
  37. data/man/man8/puppet-lookup.8 +1 -1
  38. data/man/man8/puppet-man.8 +1 -1
  39. data/man/man8/puppet-module.8 +1 -1
  40. data/man/man8/puppet-node.8 +1 -1
  41. data/man/man8/puppet-parser.8 +1 -1
  42. data/man/man8/puppet-plugin.8 +1 -1
  43. data/man/man8/puppet-report.8 +1 -1
  44. data/man/man8/puppet-resource.8 +1 -1
  45. data/man/man8/puppet-script.8 +1 -1
  46. data/man/man8/puppet-ssl.8 +1 -1
  47. data/man/man8/puppet-status.8 +1 -1
  48. data/man/man8/puppet.8 +2 -2
  49. data/spec/integration/agent/logging_spec.rb +5 -7
  50. data/spec/integration/application/apply_spec.rb +18 -16
  51. data/spec/integration/application/doc_spec.rb +1 -2
  52. data/spec/integration/application/lookup_spec.rb +5 -5
  53. data/spec/integration/configurer_spec.rb +5 -6
  54. data/spec/integration/defaults_spec.rb +5 -6
  55. data/spec/integration/directory_environments_spec.rb +1 -1
  56. data/spec/integration/faces/config_spec.rb +3 -4
  57. data/spec/integration/faces/documentation_spec.rb +0 -1
  58. data/spec/integration/faces/plugin_spec.rb +1 -1
  59. data/spec/integration/file_bucket/file_spec.rb +2 -4
  60. data/spec/integration/file_serving/content_spec.rb +0 -1
  61. data/spec/integration/file_serving/fileset_spec.rb +0 -1
  62. data/spec/integration/file_serving/metadata_spec.rb +0 -1
  63. data/spec/integration/file_serving/terminus_helper_spec.rb +0 -1
  64. data/spec/integration/indirector/catalog/compiler_spec.rb +10 -11
  65. data/spec/integration/indirector/direct_file_server_spec.rb +1 -1
  66. data/spec/integration/indirector/facts/facter_spec.rb +4 -5
  67. data/spec/integration/indirector/file_content/file_server_spec.rb +7 -8
  68. data/spec/integration/indirector/file_metadata/file_server_spec.rb +7 -8
  69. data/spec/integration/network/authconfig_spec.rb +23 -24
  70. data/spec/integration/network/formats_spec.rb +0 -1
  71. data/spec/integration/network/http_pool_spec.rb +3 -3
  72. data/spec/integration/node/environment_spec.rb +0 -1
  73. data/spec/integration/node/facts_spec.rb +9 -10
  74. data/spec/integration/node_spec.rb +6 -7
  75. data/spec/integration/parser/catalog_spec.rb +1 -5
  76. data/spec/integration/parser/collection_spec.rb +1 -2
  77. data/spec/integration/parser/compiler_spec.rb +6 -6
  78. data/spec/integration/parser/scope_spec.rb +1 -1
  79. data/spec/integration/parser/undef_param_spec.rb +1 -1
  80. data/spec/integration/provider/service/init_spec.rb +4 -5
  81. data/spec/integration/provider/service/systemd_spec.rb +0 -2
  82. data/spec/integration/provider/service/windows_spec.rb +1 -2
  83. data/spec/integration/reference/providers_spec.rb +1 -2
  84. data/spec/integration/reports_spec.rb +1 -2
  85. data/spec/integration/resource/catalog_spec.rb +14 -17
  86. data/spec/integration/resource/type_collection_spec.rb +4 -5
  87. data/spec/integration/rest/client_spec.rb +1 -1
  88. data/spec/integration/ssl/certificate_request_spec.rb +0 -1
  89. data/spec/integration/ssl/host_spec.rb +1 -2
  90. data/spec/integration/ssl/key_spec.rb +0 -1
  91. data/spec/integration/test/test_helper_spec.rb +0 -1
  92. data/spec/integration/transaction/report_spec.rb +6 -11
  93. data/spec/integration/transaction_spec.rb +18 -19
  94. data/spec/integration/type/exec_spec.rb +0 -1
  95. data/spec/integration/type/file_spec.rb +13 -14
  96. data/spec/integration/type/package_spec.rb +19 -23
  97. data/spec/integration/type/tidy_spec.rb +1 -2
  98. data/spec/integration/type_spec.rb +0 -1
  99. data/spec/integration/util/autoload_spec.rb +1 -2
  100. data/spec/integration/util/rdoc/parser_spec.rb +0 -1
  101. data/spec/integration/util/settings_spec.rb +0 -1
  102. data/spec/integration/util/windows/adsi_spec.rb +3 -5
  103. data/spec/integration/util/windows/principal_spec.rb +0 -1
  104. data/spec/integration/util/windows/process_spec.rb +4 -6
  105. data/spec/integration/util/windows/registry_spec.rb +41 -51
  106. data/spec/integration/util/windows/security_spec.rb +2 -4
  107. data/spec/integration/util/windows/user_spec.rb +18 -20
  108. data/spec/integration/util_spec.rb +4 -7
  109. data/spec/lib/puppet_spec/compiler.rb +1 -1
  110. data/spec/lib/puppet_spec/files.rb +0 -1
  111. data/spec/lib/puppet_spec/module_tool/shared_functions.rb +1 -1
  112. data/spec/lib/puppet_spec/scope.rb +1 -2
  113. data/spec/shared_behaviours/all_parsedfile_providers.rb +1 -1
  114. data/spec/shared_behaviours/file_server_terminus.rb +8 -9
  115. data/spec/shared_behaviours/file_serving.rb +6 -8
  116. data/spec/shared_behaviours/file_serving_model.rb +3 -5
  117. data/spec/shared_behaviours/hiera_indirections.rb +3 -4
  118. data/spec/shared_behaviours/iterative_functions.rb +0 -1
  119. data/spec/shared_behaviours/memory_terminus.rb +2 -2
  120. data/spec/shared_examples/rhel_package_provider.rb +112 -70
  121. data/spec/spec_helper.rb +10 -1
  122. data/spec/unit/agent/disabler_spec.rb +4 -5
  123. data/spec/unit/agent/locker_spec.rb +12 -13
  124. data/spec/unit/agent_spec.rb +80 -85
  125. data/spec/unit/application/agent_spec.rb +88 -94
  126. data/spec/unit/application/apply_spec.rb +82 -83
  127. data/spec/unit/application/config_spec.rb +0 -1
  128. data/spec/unit/application/describe_spec.rb +6 -7
  129. data/spec/unit/application/device_spec.rb +379 -384
  130. data/spec/unit/application/doc_spec.rb +44 -46
  131. data/spec/unit/application/face_base_spec.rb +61 -62
  132. data/spec/unit/application/facts_spec.rb +3 -4
  133. data/spec/unit/application/filebucket_spec.rb +66 -74
  134. data/spec/unit/application/indirection_base_spec.rb +8 -6
  135. data/spec/unit/application/lookup_spec.rb +26 -26
  136. data/spec/unit/application/resource_spec.rb +42 -48
  137. data/spec/unit/application/ssl_spec.rb +9 -9
  138. data/spec/unit/application_spec.rb +82 -92
  139. data/spec/unit/capability_spec.rb +6 -6
  140. data/spec/unit/certificate_factory_spec.rb +3 -5
  141. data/spec/unit/configurer/downloader_spec.rb +20 -21
  142. data/spec/unit/configurer/fact_handler_spec.rb +2 -3
  143. data/spec/unit/configurer/plugin_handler_spec.rb +41 -8
  144. data/spec/unit/configurer_spec.rb +189 -192
  145. data/spec/unit/confine/exists_spec.rb +17 -15
  146. data/spec/unit/confine/false_spec.rb +5 -6
  147. data/spec/unit/confine/feature_spec.rb +7 -5
  148. data/spec/unit/confine/true_spec.rb +5 -6
  149. data/spec/unit/confine/variable_spec.rb +14 -15
  150. data/spec/unit/confine_collection_spec.rb +28 -29
  151. data/spec/unit/confine_spec.rb +13 -14
  152. data/spec/unit/confiner_spec.rb +10 -11
  153. data/spec/unit/context/trusted_information_spec.rb +1 -1
  154. data/spec/unit/daemon_spec.rb +35 -36
  155. data/spec/unit/data_providers/function_data_provider_spec.rb +0 -1
  156. data/spec/unit/data_providers/hiera_data_provider_spec.rb +0 -1
  157. data/spec/unit/datatypes_spec.rb +3 -4
  158. data/spec/unit/defaults_spec.rb +18 -13
  159. data/spec/unit/environments_spec.rb +7 -7
  160. data/spec/unit/etc_spec.rb +30 -32
  161. data/spec/unit/external/pson_spec.rb +0 -1
  162. data/spec/unit/face/catalog_spec.rb +0 -1
  163. data/spec/unit/face/config_spec.rb +31 -35
  164. data/spec/unit/face/epp_face_spec.rb +3 -4
  165. data/spec/unit/face/facts_spec.rb +5 -6
  166. data/spec/unit/face/generate_spec.rb +4 -5
  167. data/spec/unit/face/help_spec.rb +7 -8
  168. data/spec/unit/face/key_spec.rb +0 -1
  169. data/spec/unit/face/man_spec.rb +1 -2
  170. data/spec/unit/face/module/install_spec.rb +3 -5
  171. data/spec/unit/face/module/list_spec.rb +2 -12
  172. data/spec/unit/face/module/search_spec.rb +11 -9
  173. data/spec/unit/face/module/uninstall_spec.rb +4 -8
  174. data/spec/unit/face/node_spec.rb +23 -24
  175. data/spec/unit/face/parser_spec.rb +3 -3
  176. data/spec/unit/face/plugin_spec.rb +36 -9
  177. data/spec/unit/face/status_spec.rb +0 -1
  178. data/spec/unit/file_bucket/dipper_spec.rb +24 -20
  179. data/spec/unit/file_bucket/file_spec.rb +0 -2
  180. data/spec/unit/file_serving/base_spec.rb +14 -15
  181. data/spec/unit/file_serving/configuration/parser_spec.rb +27 -28
  182. data/spec/unit/file_serving/configuration_spec.rb +63 -66
  183. data/spec/unit/file_serving/content_spec.rb +10 -11
  184. data/spec/unit/file_serving/fileset_spec.rb +63 -58
  185. data/spec/unit/file_serving/http_metadata_spec.rb +8 -7
  186. data/spec/unit/file_serving/metadata_spec.rb +36 -36
  187. data/spec/unit/file_serving/mount/file_spec.rb +31 -32
  188. data/spec/unit/file_serving/mount/locales_spec.rb +23 -24
  189. data/spec/unit/file_serving/mount/modules_spec.rb +14 -15
  190. data/spec/unit/file_serving/mount/pluginfacts_spec.rb +23 -24
  191. data/spec/unit/file_serving/mount/plugins_spec.rb +23 -24
  192. data/spec/unit/file_serving/mount/tasks_spec.rb +14 -15
  193. data/spec/unit/file_serving/mount_spec.rb +0 -1
  194. data/spec/unit/file_serving/terminus_helper_spec.rb +37 -42
  195. data/spec/unit/file_serving/terminus_selector_spec.rb +12 -13
  196. data/spec/unit/file_system/uniquefile_spec.rb +4 -4
  197. data/spec/unit/file_system_spec.rb +4 -4
  198. data/spec/unit/forge/errors_spec.rb +1 -1
  199. data/spec/unit/forge/forge_spec.rb +13 -14
  200. data/spec/unit/forge/module_release_spec.rb +18 -18
  201. data/spec/unit/forge/repository_spec.rb +29 -30
  202. data/spec/unit/forge_spec.rb +15 -11
  203. data/spec/unit/functions/binary_file_spec.rb +3 -3
  204. data/spec/unit/functions/contain_spec.rb +0 -2
  205. data/spec/unit/functions/defined_spec.rb +0 -1
  206. data/spec/unit/functions/epp_spec.rb +2 -2
  207. data/spec/unit/functions/find_file_spec.rb +7 -7
  208. data/spec/unit/functions/include_spec.rb +0 -4
  209. data/spec/unit/functions/lookup_fixture_spec.rb +0 -1
  210. data/spec/unit/functions/lookup_spec.rb +1 -2
  211. data/spec/unit/functions/module_directory_spec.rb +12 -12
  212. data/spec/unit/functions/require_spec.rb +0 -3
  213. data/spec/unit/functions/shared.rb +5 -8
  214. data/spec/unit/functions/versioncmp_spec.rb +1 -2
  215. data/spec/unit/functions4_spec.rb +9 -10
  216. data/spec/unit/gettext/config_spec.rb +4 -4
  217. data/spec/unit/gettext/module_loading_spec.rb +7 -7
  218. data/spec/unit/graph/rb_tree_map_spec.rb +0 -2
  219. data/spec/unit/graph/relationship_graph_spec.rb +1 -2
  220. data/spec/unit/graph/simple_graph_spec.rb +9 -10
  221. data/spec/unit/hiera_puppet_spec.rb +20 -20
  222. data/spec/unit/indirector/catalog/compiler_spec.rb +147 -149
  223. data/spec/unit/indirector/catalog/json_spec.rb +1 -2
  224. data/spec/unit/indirector/catalog/msgpack_spec.rb +0 -1
  225. data/spec/unit/indirector/catalog/rest_spec.rb +0 -1
  226. data/spec/unit/indirector/catalog/store_configs_spec.rb +0 -1
  227. data/spec/unit/indirector/catalog/yaml_spec.rb +0 -1
  228. data/spec/unit/indirector/certificate/file_spec.rb +0 -1
  229. data/spec/unit/indirector/certificate/rest_spec.rb +8 -10
  230. data/spec/unit/indirector/certificate_request/file_spec.rb +0 -1
  231. data/spec/unit/indirector/certificate_request/rest_spec.rb +0 -1
  232. data/spec/unit/indirector/direct_file_server_spec.rb +17 -18
  233. data/spec/unit/indirector/envelope_spec.rb +1 -2
  234. data/spec/unit/indirector/exec_spec.rb +4 -5
  235. data/spec/unit/indirector/face_spec.rb +9 -9
  236. data/spec/unit/indirector/facts/facter_spec.rb +37 -43
  237. data/spec/unit/indirector/facts/network_device_spec.rb +8 -9
  238. data/spec/unit/indirector/facts/rest_spec.rb +7 -8
  239. data/spec/unit/indirector/facts/store_configs_spec.rb +0 -1
  240. data/spec/unit/indirector/facts/yaml_spec.rb +0 -1
  241. data/spec/unit/indirector/file_bucket_file/file_spec.rb +3 -4
  242. data/spec/unit/indirector/file_bucket_file/rest_spec.rb +0 -1
  243. data/spec/unit/indirector/file_bucket_file/selector_spec.rb +4 -5
  244. data/spec/unit/indirector/file_content/file_server_spec.rb +0 -1
  245. data/spec/unit/indirector/file_content/file_spec.rb +0 -1
  246. data/spec/unit/indirector/file_content/rest_spec.rb +0 -1
  247. data/spec/unit/indirector/file_content/selector_spec.rb +0 -1
  248. data/spec/unit/indirector/file_metadata/file_server_spec.rb +0 -1
  249. data/spec/unit/indirector/file_metadata/file_spec.rb +12 -13
  250. data/spec/unit/indirector/file_metadata/rest_spec.rb +0 -1
  251. data/spec/unit/indirector/file_metadata/selector_spec.rb +0 -1
  252. data/spec/unit/indirector/file_server_spec.rb +87 -87
  253. data/spec/unit/indirector/indirection_spec.rb +242 -226
  254. data/spec/unit/indirector/json_spec.rb +7 -9
  255. data/spec/unit/indirector/key/file_spec.rb +21 -22
  256. data/spec/unit/indirector/memory_spec.rb +6 -7
  257. data/spec/unit/indirector/msgpack_spec.rb +7 -9
  258. data/spec/unit/indirector/node/exec_spec.rb +2 -3
  259. data/spec/unit/indirector/node/memory_spec.rb +2 -4
  260. data/spec/unit/indirector/node/msgpack_spec.rb +0 -1
  261. data/spec/unit/indirector/node/plain_spec.rb +2 -4
  262. data/spec/unit/indirector/node/rest_spec.rb +0 -1
  263. data/spec/unit/indirector/node/store_configs_spec.rb +0 -1
  264. data/spec/unit/indirector/node/yaml_spec.rb +0 -1
  265. data/spec/unit/indirector/none_spec.rb +5 -5
  266. data/spec/unit/indirector/plain_spec.rb +7 -8
  267. data/spec/unit/indirector/report/msgpack_spec.rb +0 -1
  268. data/spec/unit/indirector/report/processor_spec.rb +21 -22
  269. data/spec/unit/indirector/report/rest_spec.rb +11 -12
  270. data/spec/unit/indirector/report/yaml_spec.rb +0 -1
  271. data/spec/unit/indirector/request_spec.rb +11 -12
  272. data/spec/unit/indirector/resource/ral_spec.rb +47 -54
  273. data/spec/unit/indirector/resource/store_configs_spec.rb +0 -1
  274. data/spec/unit/indirector/rest_spec.rb +113 -110
  275. data/spec/unit/indirector/ssl_file_spec.rb +64 -65
  276. data/spec/unit/indirector/status/local_spec.rb +0 -1
  277. data/spec/unit/indirector/status/rest_spec.rb +0 -1
  278. data/spec/unit/indirector/store_configs_spec.rb +0 -1
  279. data/spec/unit/indirector/terminus_spec.rb +27 -27
  280. data/spec/unit/indirector/yaml_spec.rb +5 -6
  281. data/spec/unit/indirector_spec.rb +1 -2
  282. data/spec/unit/info_service_spec.rb +1 -1
  283. data/spec/unit/interface/action_builder_spec.rb +0 -1
  284. data/spec/unit/interface/action_manager_spec.rb +0 -1
  285. data/spec/unit/interface/action_spec.rb +2 -3
  286. data/spec/unit/interface/documentation_spec.rb +0 -1
  287. data/spec/unit/interface/face_collection_spec.rb +19 -12
  288. data/spec/unit/interface_spec.rb +3 -3
  289. data/spec/unit/man_spec.rb +3 -4
  290. data/spec/unit/module_spec.rb +46 -51
  291. data/spec/unit/module_tool/applications/installer_spec.rb +10 -11
  292. data/spec/unit/module_tool/applications/searcher_spec.rb +3 -3
  293. data/spec/unit/module_tool/applications/uninstaller_spec.rb +1 -2
  294. data/spec/unit/module_tool/applications/unpacker_spec.rb +13 -13
  295. data/spec/unit/module_tool/applications/upgrader_spec.rb +5 -5
  296. data/spec/unit/module_tool/install_directory_spec.rb +8 -8
  297. data/spec/unit/module_tool/installed_modules_spec.rb +3 -3
  298. data/spec/unit/module_tool/tar/gnu_spec.rb +6 -6
  299. data/spec/unit/module_tool/tar/mini_spec.rb +12 -12
  300. data/spec/unit/module_tool/tar_spec.rb +12 -13
  301. data/spec/unit/module_tool_spec.rb +7 -12
  302. data/spec/unit/network/auth_config_parser_spec.rb +11 -13
  303. data/spec/unit/network/authconfig_spec.rb +17 -18
  304. data/spec/unit/network/authorization_spec.rb +4 -5
  305. data/spec/unit/network/authstore_spec.rb +0 -1
  306. data/spec/unit/network/format_handler_spec.rb +0 -1
  307. data/spec/unit/network/format_spec.rb +9 -10
  308. data/spec/unit/network/format_support_spec.rb +28 -29
  309. data/spec/unit/network/formats_spec.rb +4 -5
  310. data/spec/unit/network/http/api/indirected_routes_spec.rb +24 -29
  311. data/spec/unit/network/http/api/master/v3/authorization_spec.rb +2 -2
  312. data/spec/unit/network/http/api/master/v3/environment_spec.rb +1 -1
  313. data/spec/unit/network/http/api/master/v3/environments_spec.rb +6 -7
  314. data/spec/unit/network/http/api_spec.rb +0 -2
  315. data/spec/unit/network/http/compression_spec.rb +21 -22
  316. data/spec/unit/network/http/connection_spec.rb +35 -35
  317. data/spec/unit/network/http/factory_spec.rb +5 -6
  318. data/spec/unit/network/http/handler_spec.rb +9 -18
  319. data/spec/unit/network/http/nocache_pool_spec.rb +6 -7
  320. data/spec/unit/network/http/pool_spec.rb +33 -34
  321. data/spec/unit/network/http/request_spec.rb +0 -2
  322. data/spec/unit/network/http/response_spec.rb +11 -13
  323. data/spec/unit/network/http/route_spec.rb +0 -1
  324. data/spec/unit/network/http/session_spec.rb +2 -3
  325. data/spec/unit/network/http/site_spec.rb +0 -1
  326. data/spec/unit/network/http_pool_spec.rb +19 -10
  327. data/spec/unit/network/http_spec.rb +0 -1
  328. data/spec/unit/network/resolver_spec.rb +25 -26
  329. data/spec/unit/network/rights_spec.rb +52 -53
  330. data/spec/unit/node/environment_spec.rb +14 -15
  331. data/spec/unit/node/facts_spec.rb +5 -7
  332. data/spec/unit/node_spec.rb +4 -10
  333. data/spec/unit/other/selinux_spec.rb +0 -1
  334. data/spec/unit/parameter/boolean_spec.rb +1 -2
  335. data/spec/unit/parameter/package_options_spec.rb +1 -2
  336. data/spec/unit/parameter/path_spec.rb +0 -1
  337. data/spec/unit/parameter/value_collection_spec.rb +0 -1
  338. data/spec/unit/parameter/value_spec.rb +0 -1
  339. data/spec/unit/parameter_spec.rb +9 -9
  340. data/spec/unit/parser/ast/block_expression_spec.rb +6 -8
  341. data/spec/unit/parser/ast/leaf_spec.rb +20 -21
  342. data/spec/unit/parser/compiler_spec.rb +84 -96
  343. data/spec/unit/parser/environment_compiler_spec.rb +7 -8
  344. data/spec/unit/parser/files_spec.rb +0 -1
  345. data/spec/unit/parser/functions/create_resources_spec.rb +1 -1
  346. data/spec/unit/parser/functions/digest_spec.rb +0 -1
  347. data/spec/unit/parser/functions/fail_spec.rb +1 -2
  348. data/spec/unit/parser/functions/file_spec.rb +13 -14
  349. data/spec/unit/parser/functions/fqdn_rand_spec.rb +5 -6
  350. data/spec/unit/parser/functions/generate_spec.rb +7 -8
  351. data/spec/unit/parser/functions/inline_template_spec.rb +0 -1
  352. data/spec/unit/parser/functions/regsubst_spec.rb +0 -1
  353. data/spec/unit/parser/functions/scanf_spec.rb +0 -1
  354. data/spec/unit/parser/functions/shellquote_spec.rb +0 -1
  355. data/spec/unit/parser/functions/split_spec.rb +0 -1
  356. data/spec/unit/parser/functions/sprintf_spec.rb +0 -1
  357. data/spec/unit/parser/functions/tag_spec.rb +1 -2
  358. data/spec/unit/parser/functions/tagged_spec.rb +2 -3
  359. data/spec/unit/parser/functions/template_spec.rb +13 -13
  360. data/spec/unit/parser/functions/versioncmp_spec.rb +1 -2
  361. data/spec/unit/parser/functions_spec.rb +6 -7
  362. data/spec/unit/parser/relationship_spec.rb +0 -1
  363. data/spec/unit/parser/resource_spec.rb +42 -42
  364. data/spec/unit/parser/scope_spec.rb +39 -35
  365. data/spec/unit/parser/templatewrapper_spec.rb +11 -12
  366. data/spec/unit/parser/type_loader_spec.rb +17 -19
  367. data/spec/unit/pops/adaptable_spec.rb +0 -1
  368. data/spec/unit/pops/benchmark_spec.rb +0 -1
  369. data/spec/unit/pops/evaluator/access_ops_spec.rb +0 -1
  370. data/spec/unit/pops/evaluator/arithmetic_ops_spec.rb +0 -1
  371. data/spec/unit/pops/evaluator/basic_expressions_spec.rb +0 -1
  372. data/spec/unit/pops/evaluator/collections_ops_spec.rb +0 -1
  373. data/spec/unit/pops/evaluator/comparison_ops_spec.rb +0 -1
  374. data/spec/unit/pops/evaluator/conditionals_spec.rb +0 -1
  375. data/spec/unit/pops/evaluator/evaluating_parser_spec.rb +10 -11
  376. data/spec/unit/pops/evaluator/logical_ops_spec.rb +0 -1
  377. data/spec/unit/pops/evaluator/runtime3_converter_spec.rb +0 -1
  378. data/spec/unit/pops/evaluator/string_interpolation_spec.rb +0 -1
  379. data/spec/unit/pops/evaluator/variables_spec.rb +0 -1
  380. data/spec/unit/pops/factory_spec.rb +3 -4
  381. data/spec/unit/pops/issues_spec.rb +19 -20
  382. data/spec/unit/pops/loaders/loader_spec.rb +9 -5
  383. data/spec/unit/pops/loaders/loaders_spec.rb +31 -28
  384. data/spec/unit/pops/lookup/context_spec.rb +0 -1
  385. data/spec/unit/pops/lookup/interpolation_spec.rb +2 -3
  386. data/spec/unit/pops/merge_strategy_spec.rb +0 -1
  387. data/spec/unit/pops/migration_spec.rb +3 -5
  388. data/spec/unit/pops/model/model_spec.rb +0 -1
  389. data/spec/unit/pops/model/pn_transformer_spec.rb +0 -1
  390. data/spec/unit/pops/parser/locator_spec.rb +3 -6
  391. data/spec/unit/pops/parser/parse_application_spec.rb +0 -1
  392. data/spec/unit/pops/parser/parse_basic_expressions_spec.rb +0 -1
  393. data/spec/unit/pops/parser/parse_calls_spec.rb +0 -1
  394. data/spec/unit/pops/parser/parse_capabilities_spec.rb +0 -1
  395. data/spec/unit/pops/parser/parse_conditionals_spec.rb +0 -1
  396. data/spec/unit/pops/parser/parse_containers_spec.rb +0 -1
  397. data/spec/unit/pops/parser/parse_plan_spec.rb +0 -1
  398. data/spec/unit/pops/parser/parse_resource_spec.rb +0 -1
  399. data/spec/unit/pops/parser/parse_site_spec.rb +0 -1
  400. data/spec/unit/pops/parser/pn_parser_spec.rb +0 -1
  401. data/spec/unit/pops/pn_spec.rb +0 -1
  402. data/spec/unit/pops/resource/resource_type_impl_spec.rb +0 -1
  403. data/spec/unit/pops/serialization/serialization_spec.rb +1 -1
  404. data/spec/unit/pops/serialization/to_from_hr_spec.rb +1 -1
  405. data/spec/unit/pops/types/recursion_guard_spec.rb +10 -10
  406. data/spec/unit/pops/types/ruby_generator_spec.rb +2 -2
  407. data/spec/unit/pops/types/type_asserter_spec.rb +2 -2
  408. data/spec/unit/pops/types/type_calculator_spec.rb +30 -30
  409. data/spec/unit/pops/types/type_parser_spec.rb +13 -13
  410. data/spec/unit/pops/validator/validator_spec.rb +1 -2
  411. data/spec/unit/pops/visitor_spec.rb +0 -1
  412. data/spec/unit/property/boolean_spec.rb +1 -1
  413. data/spec/unit/property/ensure_spec.rb +0 -1
  414. data/spec/unit/property/keyvalue_spec.rb +32 -34
  415. data/spec/unit/property/list_spec.rb +26 -27
  416. data/spec/unit/property/ordered_list_spec.rb +10 -14
  417. data/spec/unit/property_spec.rb +42 -43
  418. data/spec/unit/provider/aix_object_spec.rb +47 -45
  419. data/spec/unit/provider/command_spec.rb +9 -9
  420. data/spec/unit/provider/exec/posix_spec.rb +8 -9
  421. data/spec/unit/provider/exec/shell_spec.rb +0 -1
  422. data/spec/unit/provider/exec/windows_spec.rb +2 -4
  423. data/spec/unit/provider/exec_spec.rb +0 -1
  424. data/spec/unit/provider/file/posix_spec.rb +22 -24
  425. data/spec/unit/provider/file/windows_spec.rb +15 -17
  426. data/spec/unit/provider/group/aix_spec.rb +3 -2
  427. data/spec/unit/provider/group/groupadd_spec.rb +30 -26
  428. data/spec/unit/provider/group/ldap_spec.rb +18 -18
  429. data/spec/unit/provider/group/pw_spec.rb +11 -11
  430. data/spec/unit/provider/group/windows_adsi_spec.rb +54 -54
  431. data/spec/unit/provider/ldap_spec.rb +61 -62
  432. data/spec/unit/provider/nameservice/directoryservice_spec.rb +35 -36
  433. data/spec/unit/provider/nameservice_spec.rb +38 -40
  434. data/spec/unit/provider/package/aix_spec.rb +15 -15
  435. data/spec/unit/provider/package/appdmg_spec.rb +13 -13
  436. data/spec/unit/provider/package/apt_spec.rb +44 -27
  437. data/spec/unit/provider/package/aptitude_spec.rb +6 -7
  438. data/spec/unit/provider/package/aptrpm_spec.rb +7 -12
  439. data/spec/unit/provider/package/base_spec.rb +4 -4
  440. data/spec/unit/provider/package/dnf_spec.rb +18 -20
  441. data/spec/unit/provider/package/dpkg_spec.rb +52 -52
  442. data/spec/unit/provider/package/freebsd_spec.rb +11 -11
  443. data/spec/unit/provider/package/gem_spec.rb +51 -43
  444. data/spec/unit/provider/package/hpux_spec.rb +8 -8
  445. data/spec/unit/provider/package/macports_spec.rb +46 -42
  446. data/spec/unit/provider/package/nim_spec.rb +30 -39
  447. data/spec/unit/provider/package/openbsd_spec.rb +36 -39
  448. data/spec/unit/provider/package/opkg_spec.rb +23 -26
  449. data/spec/unit/provider/package/pacman_spec.rb +97 -118
  450. data/spec/unit/provider/package/pip_spec.rb +71 -72
  451. data/spec/unit/provider/package/pkg_spec.rb +113 -114
  452. data/spec/unit/provider/package/pkgdmg_spec.rb +65 -63
  453. data/spec/unit/provider/package/pkgin_spec.rb +10 -8
  454. data/spec/unit/provider/package/pkgng_spec.rb +21 -22
  455. data/spec/unit/provider/package/pkgutil_spec.rb +45 -49
  456. data/spec/unit/provider/package/portage_spec.rb +71 -75
  457. data/spec/unit/provider/package/puppet_gem_spec.rb +28 -8
  458. data/spec/unit/provider/package/rpm_spec.rb +53 -64
  459. data/spec/unit/provider/package/sun_spec.rb +16 -18
  460. data/spec/unit/provider/package/tdnf_spec.rb +2 -2
  461. data/spec/unit/provider/package/up2date_spec.rb +2 -4
  462. data/spec/unit/provider/package/urpmi_spec.rb +15 -17
  463. data/spec/unit/provider/package/windows/exe_package_spec.rb +12 -15
  464. data/spec/unit/provider/package/windows/msi_package_spec.rb +19 -22
  465. data/spec/unit/provider/package/windows/package_spec.rb +37 -42
  466. data/spec/unit/provider/package/windows_spec.rb +36 -32
  467. data/spec/unit/provider/package/yum_spec.rb +7 -7
  468. data/spec/unit/provider/package/zypper_spec.rb +87 -87
  469. data/spec/unit/provider/parsedfile_spec.rb +44 -45
  470. data/spec/unit/provider/service/base_spec.rb +4 -5
  471. data/spec/unit/provider/service/bsd_spec.rb +27 -29
  472. data/spec/unit/provider/service/daemontools_spec.rb +35 -35
  473. data/spec/unit/provider/service/debian_spec.rb +38 -38
  474. data/spec/unit/provider/service/freebsd_spec.rb +18 -18
  475. data/spec/unit/provider/service/gentoo_spec.rb +50 -55
  476. data/spec/unit/provider/service/init_spec.rb +53 -52
  477. data/spec/unit/provider/service/launchd_spec.rb +138 -116
  478. data/spec/unit/provider/service/openbsd_spec.rb +50 -50
  479. data/spec/unit/provider/service/openrc_spec.rb +43 -45
  480. data/spec/unit/provider/service/openwrt_spec.rb +26 -31
  481. data/spec/unit/provider/service/rcng_spec.rb +14 -14
  482. data/spec/unit/provider/service/redhat_spec.rb +45 -43
  483. data/spec/unit/provider/service/runit_spec.rb +29 -27
  484. data/spec/unit/provider/service/smf_spec.rb +74 -66
  485. data/spec/unit/provider/service/src_spec.rb +46 -47
  486. data/spec/unit/provider/service/systemd_spec.rb +113 -122
  487. data/spec/unit/provider/service/upstart_spec.rb +74 -71
  488. data/spec/unit/provider/service/windows_spec.rb +33 -41
  489. data/spec/unit/provider/user/aix_spec.rb +31 -31
  490. data/spec/unit/provider/user/directoryservice_spec.rb +109 -114
  491. data/spec/unit/provider/user/hpux_spec.rb +16 -16
  492. data/spec/unit/provider/user/ldap_spec.rb +57 -57
  493. data/spec/unit/provider/user/openbsd_spec.rb +10 -12
  494. data/spec/unit/provider/user/pw_spec.rb +37 -35
  495. data/spec/unit/provider/user/user_role_add_spec.rb +93 -93
  496. data/spec/unit/provider/user/useradd_spec.rb +93 -92
  497. data/spec/unit/provider/user/windows_adsi_spec.rb +59 -60
  498. data/spec/unit/provider_spec.rb +35 -35
  499. data/spec/unit/puppet_pal_2pec.rb +4 -5
  500. data/spec/unit/puppet_pal_spec.rb +0 -1
  501. data/spec/unit/puppet_spec.rb +6 -7
  502. data/spec/unit/relationship_spec.rb +0 -1
  503. data/spec/unit/reports/http_spec.rb +22 -24
  504. data/spec/unit/reports/store_spec.rb +3 -4
  505. data/spec/unit/reports_spec.rb +12 -14
  506. data/spec/unit/resource/capability_finder_spec.rb +15 -17
  507. data/spec/unit/resource/catalog_spec.rb +72 -68
  508. data/spec/unit/resource/status_spec.rb +6 -8
  509. data/spec/unit/resource/type_collection_spec.rb +17 -18
  510. data/spec/unit/resource/type_spec.rb +34 -35
  511. data/spec/unit/resource_spec.rb +36 -32
  512. data/spec/unit/rest/client_spec.rb +56 -25
  513. data/spec/unit/rest/route_spec.rb +5 -5
  514. data/spec/unit/scheduler/job_spec.rb +0 -1
  515. data/spec/unit/scheduler/scheduler_spec.rb +0 -1
  516. data/spec/unit/scheduler/splay_job_spec.rb +1 -2
  517. data/spec/unit/settings/array_setting_spec.rb +1 -1
  518. data/spec/unit/settings/autosign_setting_spec.rb +9 -9
  519. data/spec/unit/settings/certificate_revocation_setting_spec.rb +1 -1
  520. data/spec/unit/settings/config_file_spec.rb +0 -1
  521. data/spec/unit/settings/directory_setting_spec.rb +2 -7
  522. data/spec/unit/settings/duration_setting_spec.rb +1 -2
  523. data/spec/unit/settings/enum_setting_spec.rb +1 -1
  524. data/spec/unit/settings/environment_conf_spec.rb +4 -6
  525. data/spec/unit/settings/file_setting_spec.rb +44 -46
  526. data/spec/unit/settings/path_setting_spec.rb +1 -2
  527. data/spec/unit/settings/priority_setting_spec.rb +1 -2
  528. data/spec/unit/settings/string_setting_spec.rb +14 -15
  529. data/spec/unit/settings/terminus_setting_spec.rb +1 -2
  530. data/spec/unit/settings/value_translator_spec.rb +0 -1
  531. data/spec/unit/settings_spec.rb +228 -235
  532. data/spec/unit/ssl/base_spec.rb +14 -15
  533. data/spec/unit/ssl/certificate_request_spec.rb +62 -58
  534. data/spec/unit/ssl/certificate_spec.rb +23 -25
  535. data/spec/unit/ssl/digest_spec.rb +0 -1
  536. data/spec/unit/ssl/host_spec.rb +147 -130
  537. data/spec/unit/ssl/key_spec.rb +30 -31
  538. data/spec/unit/ssl/ssl_provider_spec.rb +24 -24
  539. data/spec/unit/ssl/state_machine_spec.rb +50 -58
  540. data/spec/unit/ssl/validator_spec.rb +43 -54
  541. data/spec/unit/ssl/verifier_spec.rb +10 -10
  542. data/spec/unit/task_spec.rb +44 -45
  543. data/spec/unit/transaction/additional_resource_generator_spec.rb +3 -5
  544. data/spec/unit/transaction/event_manager_spec.rb +87 -88
  545. data/spec/unit/transaction/event_spec.rb +16 -15
  546. data/spec/unit/transaction/persistence_spec.rb +16 -17
  547. data/spec/unit/transaction/report_spec.rb +11 -12
  548. data/spec/unit/transaction/resource_harness_spec.rb +28 -33
  549. data/spec/unit/transaction_spec.rb +100 -101
  550. data/spec/unit/type/component_spec.rb +0 -1
  551. data/spec/unit/type/exec_spec.rb +60 -56
  552. data/spec/unit/type/file/checksum_spec.rb +9 -10
  553. data/spec/unit/type/file/checksum_value_spec.rb +31 -32
  554. data/spec/unit/type/file/content_spec.rb +58 -61
  555. data/spec/unit/type/file/ctime_spec.rb +0 -1
  556. data/spec/unit/type/file/ensure_spec.rb +12 -13
  557. data/spec/unit/type/file/group_spec.rb +5 -7
  558. data/spec/unit/type/file/mode_spec.rb +4 -6
  559. data/spec/unit/type/file/mtime_spec.rb +0 -1
  560. data/spec/unit/type/file/owner_spec.rb +6 -8
  561. data/spec/unit/type/file/selinux_spec.rb +17 -19
  562. data/spec/unit/type/file/source_spec.rb +104 -101
  563. data/spec/unit/type/file/type_spec.rb +0 -1
  564. data/spec/unit/type/file_spec.rb +195 -185
  565. data/spec/unit/type/filebucket_spec.rb +4 -5
  566. data/spec/unit/type/group_spec.rb +6 -8
  567. data/spec/unit/type/noop_metaparam_spec.rb +1 -2
  568. data/spec/unit/type/package/package_settings_spec.rb +44 -23
  569. data/spec/unit/type/package_spec.rb +56 -57
  570. data/spec/unit/type/resources_spec.rb +72 -74
  571. data/spec/unit/type/schedule_spec.rb +24 -26
  572. data/spec/unit/type/service_spec.rb +49 -49
  573. data/spec/unit/type/stage_spec.rb +0 -1
  574. data/spec/unit/type/tidy_spec.rb +61 -62
  575. data/spec/unit/type/user_spec.rb +24 -25
  576. data/spec/unit/type/whit_spec.rb +0 -1
  577. data/spec/unit/type_spec.rb +55 -54
  578. data/spec/unit/util/at_fork_spec.rb +18 -19
  579. data/spec/unit/util/autoload_spec.rb +55 -56
  580. data/spec/unit/util/backups_spec.rb +34 -35
  581. data/spec/unit/util/character_encoding_spec.rb +5 -5
  582. data/spec/unit/util/checksums_spec.rb +38 -39
  583. data/spec/unit/util/colors_spec.rb +1 -2
  584. data/spec/unit/util/command_line_spec.rb +24 -25
  585. data/spec/unit/util/constant_inflector_spec.rb +0 -1
  586. data/spec/unit/util/diff_spec.rb +7 -8
  587. data/spec/unit/util/errors_spec.rb +0 -1
  588. data/spec/unit/util/execution_spec.rb +185 -161
  589. data/spec/unit/util/execution_stub_spec.rb +0 -1
  590. data/spec/unit/util/feature_spec.rb +23 -14
  591. data/spec/unit/util/filetype_spec.rb +49 -49
  592. data/spec/unit/util/http_proxy_spec.rb +12 -12
  593. data/spec/unit/util/inifile_spec.rb +26 -31
  594. data/spec/unit/util/json_lockfile_spec.rb +3 -5
  595. data/spec/unit/util/ldap/connection_spec.rb +26 -25
  596. data/spec/unit/util/ldap/generator_spec.rb +0 -1
  597. data/spec/unit/util/ldap/manager_spec.rb +102 -101
  598. data/spec/unit/util/lockfile_spec.rb +0 -1
  599. data/spec/unit/util/log/destinations_spec.rb +30 -33
  600. data/spec/unit/util/log_spec.rb +35 -36
  601. data/spec/unit/util/logging_spec.rb +58 -72
  602. data/spec/unit/util/metric_spec.rb +0 -1
  603. data/spec/unit/util/monkey_patches_spec.rb +7 -9
  604. data/spec/unit/util/multi_match_spec.rb +0 -1
  605. data/spec/unit/util/network_device/config_spec.rb +0 -1
  606. data/spec/unit/util/network_device/transport/base_spec.rb +5 -6
  607. data/spec/unit/util/network_device_spec.rb +7 -9
  608. data/spec/unit/util/package_spec.rb +0 -1
  609. data/spec/unit/util/pidlock_spec.rb +21 -22
  610. data/spec/unit/util/plist_spec.rb +40 -33
  611. data/spec/unit/util/posix_spec.rb +54 -51
  612. data/spec/unit/util/rdoc_spec.rb +9 -10
  613. data/spec/unit/util/reference_spec.rb +0 -1
  614. data/spec/unit/util/resource_template_spec.rb +20 -20
  615. data/spec/unit/util/retry_action_spec.rb +7 -8
  616. data/spec/unit/util/rubygems_spec.rb +7 -8
  617. data/spec/unit/util/run_mode_spec.rb +3 -4
  618. data/spec/unit/util/selinux_spec.rb +79 -72
  619. data/spec/unit/util/splayer_spec.rb +8 -9
  620. data/spec/unit/util/ssl_spec.rb +0 -1
  621. data/spec/unit/util/storage_spec.rb +3 -4
  622. data/spec/unit/util/suidmanager_spec.rb +45 -54
  623. data/spec/unit/util/symbolic_file_mode_spec.rb +0 -1
  624. data/spec/unit/util/tag_set_spec.rb +0 -1
  625. data/spec/unit/util/tagging_spec.rb +0 -1
  626. data/spec/unit/util/terminal_spec.rb +9 -10
  627. data/spec/unit/util/user_attr_spec.rb +1 -2
  628. data/spec/unit/util/warnings_spec.rb +3 -4
  629. data/spec/unit/util/watcher/periodic_watcher_spec.rb +2 -2
  630. data/spec/unit/util/watcher_spec.rb +51 -21
  631. data/spec/unit/util/windows/access_control_entry_spec.rb +0 -1
  632. data/spec/unit/util/windows/access_control_list_spec.rb +0 -1
  633. data/spec/unit/util/windows/adsi_spec.rb +136 -138
  634. data/spec/unit/util/windows/api_types_spec.rb +0 -1
  635. data/spec/unit/util/windows/eventlog_spec.rb +9 -12
  636. data/spec/unit/util/windows/file_spec.rb +0 -1
  637. data/spec/unit/util/windows/root_certs_spec.rb +1 -2
  638. data/spec/unit/util/windows/security_descriptor_spec.rb +0 -2
  639. data/spec/unit/util/windows/service_spec.rb +66 -68
  640. data/spec/unit/util/windows/sid_spec.rb +11 -13
  641. data/spec/unit/util/windows/string_spec.rb +0 -1
  642. data/spec/unit/util_spec.rb +55 -57
  643. data/spec/unit/version_spec.rb +6 -6
  644. data/spec/unit/x509/cert_provider_spec.rb +14 -14
  645. data/spec/unit/x509/pem_store_spec.rb +5 -5
  646. metadata +2 -2
@@ -1,12 +1,7 @@
1
- #! /usr/bin/env ruby
2
- #
3
- # Unit testing for the systemd service Provider
4
- #
5
1
  require 'spec_helper'
6
2
 
7
3
  describe 'Puppet::Type::Service::Provider::Systemd', unless: Puppet::Util::Platform.jruby? do
8
4
  let(:provider_class) { Puppet::Type.type(:service).provider(:systemd) }
9
-
10
5
  if Puppet::Util::Platform.windows?
11
6
  # Get a pid for $CHILD_STATUS to latch on to
12
7
  command = "cmd.exe /c \"exit 0\""
@@ -14,8 +9,8 @@ describe 'Puppet::Type::Service::Provider::Systemd', unless: Puppet::Util::Platf
14
9
  end
15
10
 
16
11
  before :each do
17
- Puppet::Type.type(:service).stubs(:defaultprovider).returns provider_class
18
- provider_class.stubs(:which).with('systemctl').returns '/bin/systemctl'
12
+ allow(Puppet::Type.type(:service)).to receive(:defaultprovider).and_return(provider_class)
13
+ allow(provider_class).to receive(:which).with('systemctl').and_return('/bin/systemctl')
19
14
  end
20
15
 
21
16
  let :provider do
@@ -26,139 +21,135 @@ describe 'Puppet::Type::Service::Provider::Systemd', unless: Puppet::Util::Platf
26
21
 
27
22
  osfamilies.each do |osfamily|
28
23
  it "should be the default provider on #{osfamily}" do
29
- Facter.stubs(:value).with(:osfamily).returns(osfamily)
30
- Facter.stubs(:value).with(:operatingsystem).returns(osfamily)
31
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("1234")
24
+ allow(Facter).to receive(:value).with(:osfamily).and_return(osfamily)
25
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(osfamily)
26
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("1234")
32
27
  expect(provider_class).to be_default
33
28
  end
34
29
  end
35
30
 
36
31
  [7, 8].each do |ver|
37
32
  it "should be the default provider on rhel#{ver}" do
38
- Facter.stubs(:value).with(:osfamily).returns(:redhat)
39
- Facter.stubs(:value).with(:operatingsystem).returns(:redhat)
40
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns(ver.to_s)
33
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
34
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:redhat)
35
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return(ver.to_s)
41
36
  expect(provider_class).to be_default
42
37
  end
43
38
  end
44
39
 
45
40
  [ 4, 5, 6 ].each do |ver|
46
41
  it "should not be the default provider on rhel#{ver}" do
47
- # In Ruby 1.8.7, the order of hash elements differs from 1.9+ and
48
- # caused short-circuiting of the logic used by default.all? in the
49
- # provider. As a workaround we need to use stubs() instead of
50
- # expects() here.
51
- Facter.stubs(:value).with(:osfamily).returns(:redhat)
52
- Facter.stubs(:value).with(:operatingsystem).returns(:redhat)
53
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("#{ver}")
42
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
43
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:redhat)
44
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("#{ver}")
54
45
  expect(provider_class).not_to be_default
55
46
  end
56
47
  end
57
48
 
58
49
  [ 17, 18, 19, 20, 21, 22, 23 ].each do |ver|
59
50
  it "should be the default provider on fedora#{ver}" do
60
- Facter.stubs(:value).with(:osfamily).returns(:redhat)
61
- Facter.stubs(:value).with(:operatingsystem).returns(:fedora)
62
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("#{ver}")
51
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
52
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:fedora)
53
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("#{ver}")
63
54
  expect(provider_class).to be_default
64
55
  end
65
56
  end
66
57
 
67
58
  it "should be the default provider on Amazon Linux 2.0" do
68
- Facter.stubs(:value).with(:osfamily).returns(:redhat)
69
- Facter.stubs(:value).with(:operatingsystem).returns(:amazon)
70
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("2")
59
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
60
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:amazon)
61
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("2")
71
62
  expect(provider_class).to be_default
72
63
  end
73
64
 
74
65
  it "should not be the default provider on Amazon Linux 2017.09" do
75
- Facter.stubs(:value).with(:osfamily).returns(:redhat)
76
- Facter.stubs(:value).with(:operatingsystem).returns(:amazon)
77
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("2017")
66
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:redhat)
67
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:amazon)
68
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("2017")
78
69
  expect(provider_class).not_to be_default
79
70
  end
80
71
 
81
72
  it "should be the default provider on cumulus3" do
82
- Facter.stubs(:value).with(:osfamily).returns(:debian)
83
- Facter.stubs(:value).with(:operatingsystem).returns('CumulusLinux')
84
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("3")
73
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:debian)
74
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return('CumulusLinux')
75
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("3")
85
76
  expect(provider_class).to be_default
86
77
  end
87
78
 
88
79
  it "should be the default provider on sles12" do
89
- Facter.stubs(:value).with(:osfamily).returns(:suse)
90
- Facter.stubs(:value).with(:operatingsystem).returns(:suse)
91
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("12")
80
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:suse)
81
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:suse)
82
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("12")
92
83
  expect(provider_class).to be_default
93
84
  end
94
85
 
95
86
  it "should be the default provider on opensuse13" do
96
- Facter.stubs(:value).with(:osfamily).returns(:suse)
97
- Facter.stubs(:value).with(:operatingsystem).returns(:suse)
98
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("13")
87
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:suse)
88
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:suse)
89
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("13")
99
90
  expect(provider_class).to be_default
100
91
  end
101
92
 
102
93
  # tumbleweed is a rolling release with date-based major version numbers
103
94
  it "should be the default provider on tumbleweed" do
104
- Facter.stubs(:value).with(:osfamily).returns(:suse)
105
- Facter.stubs(:value).with(:operatingsystem).returns(:suse)
106
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("20150829")
95
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:suse)
96
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:suse)
97
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("20150829")
107
98
  expect(provider_class).to be_default
108
99
  end
109
100
 
110
101
  # leap is the next generation suse release
111
102
  it "should be the default provider on leap" do
112
- Facter.stubs(:value).with(:osfamily).returns(:suse)
113
- Facter.stubs(:value).with(:operatingsystem).returns(:leap)
114
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("42")
103
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:suse)
104
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:leap)
105
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("42")
115
106
  expect(provider_class).to be_default
116
107
  end
117
108
 
118
109
  it "should not be the default provider on debian7" do
119
- Facter.stubs(:value).with(:osfamily).returns(:debian)
120
- Facter.stubs(:value).with(:operatingsystem).returns(:debian)
121
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("7")
110
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:debian)
111
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:debian)
112
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("7")
122
113
  expect(provider_class).not_to be_default
123
114
  end
124
115
 
125
116
  it "should be the default provider on debian8" do
126
- Facter.stubs(:value).with(:osfamily).returns(:debian)
127
- Facter.stubs(:value).with(:operatingsystem).returns(:debian)
128
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("8")
117
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:debian)
118
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:debian)
119
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("8")
129
120
  expect(provider_class).to be_default
130
121
  end
131
122
 
132
123
  it "should not be the default provider on ubuntu14.04" do
133
- Facter.stubs(:value).with(:osfamily).returns(:debian)
134
- Facter.stubs(:value).with(:operatingsystem).returns(:ubuntu)
135
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("14.04")
124
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:debian)
125
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:ubuntu)
126
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("14.04")
136
127
  expect(provider_class).not_to be_default
137
128
  end
138
129
 
139
130
  [ '15.04', '15.10', '16.04', '16.10', '17.04', '17.10', '18.04' ].each do |ver|
140
131
  it "should be the default provider on ubuntu#{ver}" do
141
- Facter.stubs(:value).with(:osfamily).returns(:debian)
142
- Facter.stubs(:value).with(:operatingsystem).returns(:ubuntu)
143
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("#{ver}")
132
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:debian)
133
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:ubuntu)
134
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("#{ver}")
144
135
  expect(provider_class).to be_default
145
136
  end
146
137
  end
147
138
 
148
139
  [ '10', '11', '12', '13', '14', '15', '16', '17' ].each do |ver|
149
140
  it "should not be the default provider on LinuxMint#{ver}" do
150
- Facter.stubs(:value).with(:osfamily).returns(:debian)
151
- Facter.stubs(:value).with(:operatingsystem).returns(:LinuxMint)
152
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("#{ver}")
141
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:debian)
142
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:LinuxMint)
143
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("#{ver}")
153
144
  expect(provider_class).not_to be_default
154
145
  end
155
146
  end
156
147
 
157
148
  [ '18', '19' ].each do |ver|
158
149
  it "should be the default provider on LinuxMint#{ver}" do
159
- Facter.stubs(:value).with(:osfamily).returns(:debian)
160
- Facter.stubs(:value).with(:operatingsystem).returns(:LinuxMint)
161
- Facter.stubs(:value).with(:operatingsystemmajrelease).returns("#{ver}")
150
+ allow(Facter).to receive(:value).with(:osfamily).and_return(:debian)
151
+ allow(Facter).to receive(:value).with(:operatingsystem).and_return(:LinuxMint)
152
+ allow(Facter).to receive(:value).with(:operatingsystemmajrelease).and_return("#{ver}")
162
153
  expect(provider_class).to be_default
163
154
  end
164
155
  end
@@ -175,7 +166,7 @@ describe 'Puppet::Type::Service::Provider::Systemd', unless: Puppet::Util::Platf
175
166
  end
176
167
 
177
168
  it "should return only services" do
178
- provider_class.expects(:systemctl).with('list-unit-files', '--type', 'service', '--full', '--all', '--no-pager').returns File.read(my_fixture('list_unit_files_services'))
169
+ expect(provider_class).to receive(:systemctl).with('list-unit-files', '--type', 'service', '--full', '--all', '--no-pager').and_return(File.read(my_fixture('list_unit_files_services')))
179
170
  expect(provider_class.instances.map(&:name)).to match_array(%w{
180
171
  arp-ethers.service
181
172
  auditd.service
@@ -189,32 +180,32 @@ describe 'Puppet::Type::Service::Provider::Systemd', unless: Puppet::Util::Platf
189
180
  describe "#start" do
190
181
  it "should use the supplied start command if specified" do
191
182
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service', :start => '/bin/foo'))
192
- provider.expects(:daemon_reload?).returns('no')
193
- provider.expects(:execute).with(['/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
183
+ expect(provider).to receive(:daemon_reload?).and_return('no')
184
+ expect(provider).to receive(:execute).with(['/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
194
185
  provider.start
195
186
  end
196
187
 
197
188
  it "should start the service with systemctl start otherwise" do
198
189
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
199
- provider.expects(:systemctl).with(:unmask, 'sshd.service')
200
- provider.expects(:daemon_reload?).returns('no')
201
- provider.expects(:execute).with(['/bin/systemctl','start','sshd.service'], {:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
190
+ expect(provider).to receive(:systemctl).with(:unmask, 'sshd.service')
191
+ expect(provider).to receive(:daemon_reload?).and_return('no')
192
+ expect(provider).to receive(:execute).with(['/bin/systemctl','start','sshd.service'], {:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
202
193
  provider.start
203
194
  end
204
195
 
205
196
  it "should show journald logs on failure" do
206
197
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
207
- provider.expects(:systemctl).with(:unmask, 'sshd.service')
208
- provider.expects(:daemon_reload?).returns('no')
209
- provider.expects(:execute).with(['/bin/systemctl','start','sshd.service'],{:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
210
- .raises(Puppet::ExecutionFailure, "Failed to start sshd.service: Unit sshd.service failed to load: Invalid argument. See system logs and 'systemctl status sshd.service' for details.")
198
+ expect(provider).to receive(:systemctl).with(:unmask, 'sshd.service')
199
+ expect(provider).to receive(:daemon_reload?).and_return('no')
200
+ expect(provider).to receive(:execute).with(['/bin/systemctl','start','sshd.service'],{:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
201
+ .and_raise(Puppet::ExecutionFailure, "Failed to start sshd.service: Unit sshd.service failed to load: Invalid argument. See system logs and 'systemctl status sshd.service' for details.")
211
202
  journalctl_logs = <<-EOS
212
203
  -- Logs begin at Tue 2016-06-14 11:59:21 UTC, end at Tue 2016-06-14 21:45:02 UTC. --
213
204
  Jun 14 21:41:34 foo.example.com systemd[1]: Stopping sshd Service...
214
205
  Jun 14 21:41:35 foo.example.com systemd[1]: Starting sshd Service...
215
206
  Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= and ExecStop= setting. Refusing.
216
207
  EOS
217
- provider.expects(:execute).with("journalctl -n 50 --since '5 minutes ago' -u sshd.service --no-pager").returns(journalctl_logs)
208
+ expect(provider).to receive(:execute).with("journalctl -n 50 --since '5 minutes ago' -u sshd.service --no-pager").and_return(journalctl_logs)
218
209
  expect { provider.start }.to raise_error(Puppet::Error, /Systemd start for sshd.service failed![\n]+journalctl log for sshd.service:[\n]+-- Logs begin at Tue 2016-06-14 11:59:21 UTC, end at Tue 2016-06-14 21:45:02 UTC. --/m)
219
210
  end
220
211
  end
@@ -222,27 +213,27 @@ Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= a
222
213
  describe "#stop" do
223
214
  it "should use the supplied stop command if specified" do
224
215
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service', :stop => '/bin/foo'))
225
- provider.expects(:execute).with(['/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
216
+ expect(provider).to receive(:execute).with(['/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
226
217
  provider.stop
227
218
  end
228
219
 
229
220
  it "should stop the service with systemctl stop otherwise" do
230
221
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
231
- provider.expects(:execute).with(['/bin/systemctl','stop','sshd.service'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
222
+ expect(provider).to receive(:execute).with(['/bin/systemctl','stop','sshd.service'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
232
223
  provider.stop
233
224
  end
234
225
 
235
226
  it "should show journald logs on failure" do
236
227
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
237
- provider.expects(:execute).with(['/bin/systemctl','stop','sshd.service'],{:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
238
- .raises(Puppet::ExecutionFailure, "Failed to stop sshd.service: Unit sshd.service failed to load: Invalid argument. See system logs and 'systemctl status sshd.service' for details.")
228
+ expect(provider).to receive(:execute).with(['/bin/systemctl','stop','sshd.service'],{:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
229
+ .and_raise(Puppet::ExecutionFailure, "Failed to stop sshd.service: Unit sshd.service failed to load: Invalid argument. See system logs and 'systemctl status sshd.service' for details.")
239
230
  journalctl_logs = <<-EOS
240
231
  -- Logs begin at Tue 2016-06-14 11:59:21 UTC, end at Tue 2016-06-14 21:45:02 UTC. --
241
232
  Jun 14 21:41:34 foo.example.com systemd[1]: Stopping sshd Service...
242
233
  Jun 14 21:41:35 foo.example.com systemd[1]: Starting sshd Service...
243
234
  Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= and ExecStop= setting. Refusing.
244
235
  EOS
245
- provider.expects(:execute).with("journalctl -n 50 --since '5 minutes ago' -u sshd.service --no-pager").returns(journalctl_logs)
236
+ expect(provider).to receive(:execute).with("journalctl -n 50 --since '5 minutes ago' -u sshd.service --no-pager").and_return(journalctl_logs)
246
237
  expect { provider.stop }.to raise_error(Puppet::Error, /Systemd stop for sshd.service failed![\n]+journalctl log for sshd.service:[\n]-- Logs begin at Tue 2016-06-14 11:59:21 UTC, end at Tue 2016-06-14 21:45:02 UTC. --/m)
247
238
  end
248
239
  end
@@ -250,13 +241,13 @@ Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= a
250
241
  describe "#daemon_reload?" do
251
242
  it "should skip the systemctl daemon_reload if not required by the service" do
252
243
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
253
- provider.expects(:execute).with(['/bin/systemctl','show','sshd.service','--property=NeedDaemonReload'], :failonfail => false).returns "no"
244
+ expect(provider).to receive(:execute).with(['/bin/systemctl','show','sshd.service','--property=NeedDaemonReload'], :failonfail => false).and_return("no")
254
245
  provider.daemon_reload?
255
246
  end
256
247
  it "should run a systemctl daemon_reload if the service has been modified" do
257
248
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
258
- provider.expects(:execute).with(['/bin/systemctl','show','sshd.service','--property=NeedDaemonReload'], :failonfail => false).returns "yes"
259
- provider.expects(:execute).with(['/bin/systemctl','daemon-reload'], :failonfail => false)
249
+ expect(provider).to receive(:execute).with(['/bin/systemctl','show','sshd.service','--property=NeedDaemonReload'], :failonfail => false).and_return("yes")
250
+ expect(provider).to receive(:execute).with(['/bin/systemctl','daemon-reload'], :failonfail => false)
260
251
  provider.daemon_reload?
261
252
  end
262
253
  end
@@ -264,43 +255,43 @@ Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= a
264
255
  describe "#enabled?" do
265
256
  it "should return :true if the service is enabled" do
266
257
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
267
- provider.expects(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).returns "enabled\n"
268
- $CHILD_STATUS.stubs(:exitstatus).returns(0)
258
+ expect(provider).to receive(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).and_return("enabled\n")
259
+ allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
269
260
  expect(provider.enabled?).to eq(:true)
270
261
  end
271
262
 
272
263
  it "should return :true if the service is static" do
273
264
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
274
- provider.expects(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).returns "static\n"
275
- $CHILD_STATUS.stubs(:exitstatus).returns(0)
265
+ expect(provider).to receive(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).and_return("static\n")
266
+ allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
276
267
  expect(provider.enabled?).to eq(:true)
277
268
  end
278
269
 
279
270
  it "should return :false if the service is disabled" do
280
271
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
281
- provider.expects(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).returns "disabled\n"
282
- $CHILD_STATUS.stubs(:exitstatus).returns(1)
272
+ expect(provider).to receive(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).and_return("disabled\n")
273
+ allow($CHILD_STATUS).to receive(:exitstatus).and_return(1)
283
274
  expect(provider.enabled?).to eq(:false)
284
275
  end
285
276
 
286
277
  it "should return :false if the service is indirect" do
287
278
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
288
- provider.expects(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).returns "indirect\n"
289
- $CHILD_STATUS.stubs(:exitstatus).returns(0)
279
+ expect(provider).to receive(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).and_return("indirect\n")
280
+ allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
290
281
  expect(provider.enabled?).to eq(:false)
291
282
  end
292
283
 
293
284
  it "should return :false if the service is masked and the resource is attempting to be disabled" do
294
285
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service', :enable => false))
295
- provider.expects(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).returns "masked\n"
296
- $CHILD_STATUS.stubs(:exitstatus).returns(1)
286
+ expect(provider).to receive(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).and_return("masked\n")
287
+ allow($CHILD_STATUS).to receive(:exitstatus).and_return(1)
297
288
  expect(provider.enabled?).to eq(:false)
298
289
  end
299
290
 
300
291
  it "should return :mask if the service is masked and the resource is attempting to be masked" do
301
292
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service', :enable => 'mask'))
302
- provider.expects(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).returns "masked\n"
303
- $CHILD_STATUS.stubs(:exitstatus).returns(1)
293
+ expect(provider).to receive(:execute).with(['/bin/systemctl','is-enabled','sshd.service'], :failonfail => false).and_return("masked\n")
294
+ allow($CHILD_STATUS).to receive(:exitstatus).and_return(1)
304
295
  expect(provider.enabled?).to eq(:mask)
305
296
  end
306
297
  end
@@ -308,8 +299,8 @@ Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= a
308
299
  describe "#enable" do
309
300
  it "should run systemctl enable to enable a service" do
310
301
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
311
- provider.expects(:systemctl).with(:unmask, 'sshd.service')
312
- provider.expects(:systemctl).with(:enable, 'sshd.service')
302
+ expect(provider).to receive(:systemctl).with(:unmask, 'sshd.service')
303
+ expect(provider).to receive(:systemctl).with(:enable, 'sshd.service')
313
304
  provider.enable
314
305
  end
315
306
  end
@@ -317,7 +308,7 @@ Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= a
317
308
  describe "#disable" do
318
309
  it "should run systemctl disable to disable a service" do
319
310
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
320
- provider.expects(:systemctl).with(:disable, 'sshd.service')
311
+ expect(provider).to receive(:systemctl).with(:disable, 'sshd.service')
321
312
  provider.disable
322
313
  end
323
314
  end
@@ -328,8 +319,8 @@ Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= a
328
319
  # :disable is the only call in the provider that uses a symbol instead of
329
320
  # a string.
330
321
  # This should be made consistent in the future and all tests updated.
331
- provider.expects(:systemctl).with(:disable, 'sshd.service')
332
- provider.expects(:systemctl).with(:mask, 'sshd.service')
322
+ expect(provider).to receive(:systemctl).with(:disable, 'sshd.service')
323
+ expect(provider).to receive(:systemctl).with(:mask, 'sshd.service')
333
324
  provider.mask
334
325
  end
335
326
  end
@@ -339,23 +330,23 @@ Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= a
339
330
  describe "#status" do
340
331
  it "should return running if if the command returns 0" do
341
332
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
342
- provider.expects(:execute).with(['/bin/systemctl','is-active','sshd.service'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true).returns "active\n"
343
- $CHILD_STATUS.stubs(:exitstatus).returns(0)
333
+ expect(provider).to receive(:execute).with(['/bin/systemctl','is-active','sshd.service'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true).and_return("active\n")
334
+ allow($CHILD_STATUS).to receive(:exitstatus).and_return(0)
344
335
  expect(provider.status).to eq(:running)
345
336
  end
346
337
 
347
338
  [-10,-1,3,10].each { |ec|
348
339
  it "should return stopped if the command returns something non-0" do
349
340
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
350
- provider.expects(:execute).with(['/bin/systemctl','is-active','sshd.service'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true).returns "inactive\n"
351
- $CHILD_STATUS.stubs(:exitstatus).returns(ec)
341
+ expect(provider).to receive(:execute).with(['/bin/systemctl','is-active','sshd.service'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true).and_return("inactive\n")
342
+ allow($CHILD_STATUS).to receive(:exitstatus).and_return(ec)
352
343
  expect(provider.status).to eq(:stopped)
353
344
  end
354
345
  }
355
346
 
356
347
  it "should use the supplied status command if specified" do
357
348
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service', :status => '/bin/foo'))
358
- provider.expects(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
349
+ expect(provider).to receive(:execute).with(['/bin/foo'], :failonfail => false, :override_locale => false, :squelch => false, :combine => true)
359
350
  provider.status
360
351
  end
361
352
  end
@@ -365,31 +356,31 @@ Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= a
365
356
  describe "#restart" do
366
357
  it "should use the supplied restart command if specified" do
367
358
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd', :restart => '/bin/foo'))
368
- provider.expects(:daemon_reload?).returns('no')
369
- provider.expects(:execute).with(['/bin/systemctl','restart','sshd.service'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true).never
370
- provider.expects(:execute).with(['/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
359
+ expect(provider).to receive(:daemon_reload?).and_return('no')
360
+ expect(provider).to receive(:execute).with(['/bin/systemctl','restart','sshd.service'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true).never
361
+ expect(provider).to receive(:execute).with(['/bin/foo'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
371
362
  provider.restart
372
363
  end
373
364
 
374
365
  it "should restart the service with systemctl restart" do
375
366
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
376
- provider.expects(:daemon_reload?).returns('no')
377
- provider.expects(:execute).with(['/bin/systemctl','restart','sshd.service'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
367
+ expect(provider).to receive(:daemon_reload?).and_return('no')
368
+ expect(provider).to receive(:execute).with(['/bin/systemctl','restart','sshd.service'], :failonfail => true, :override_locale => false, :squelch => false, :combine => true)
378
369
  provider.restart
379
370
  end
380
371
 
381
372
  it "should show journald logs on failure" do
382
373
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
383
- provider.expects(:daemon_reload?).returns('no')
384
- provider.expects(:execute).with(['/bin/systemctl','restart','sshd.service'],{:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
385
- .raises(Puppet::ExecutionFailure, "Failed to restart sshd.service: Unit sshd.service failed to load: Invalid argument. See system logs and 'systemctl status sshd.service' for details.")
374
+ expect(provider).to receive(:daemon_reload?).and_return('no')
375
+ expect(provider).to receive(:execute).with(['/bin/systemctl','restart','sshd.service'],{:failonfail => true, :override_locale => false, :squelch => false, :combine => true})
376
+ .and_raise(Puppet::ExecutionFailure, "Failed to restart sshd.service: Unit sshd.service failed to load: Invalid argument. See system logs and 'systemctl status sshd.service' for details.")
386
377
  journalctl_logs = <<-EOS
387
378
  -- Logs begin at Tue 2016-06-14 11:59:21 UTC, end at Tue 2016-06-14 21:45:02 UTC. --
388
379
  Jun 14 21:41:34 foo.example.com systemd[1]: Stopping sshd Service...
389
380
  Jun 14 21:41:35 foo.example.com systemd[1]: Starting sshd Service...
390
381
  Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= and ExecStop= setting. Refusing.
391
382
  EOS
392
- provider.expects(:execute).with("journalctl -n 50 --since '5 minutes ago' -u sshd.service --no-pager").returns(journalctl_logs)
383
+ expect(provider).to receive(:execute).with("journalctl -n 50 --since '5 minutes ago' -u sshd.service --no-pager").and_return(journalctl_logs)
393
384
  expect { provider.restart }.to raise_error(Puppet::Error, /Systemd restart for sshd.service failed![\n]+journalctl log for sshd.service:[\n]+-- Logs begin at Tue 2016-06-14 11:59:21 UTC, end at Tue 2016-06-14 21:45:02 UTC. --/m)
394
385
  end
395
386
  end
@@ -398,8 +389,8 @@ Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= a
398
389
  [104, 106].each do |status|
399
390
  it "should return true when invoke-rc.d returns #{status}" do
400
391
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
401
- provider.stubs(:system)
402
- $CHILD_STATUS.expects(:exitstatus).returns(status)
392
+ allow(provider).to receive(:system)
393
+ expect($CHILD_STATUS).to receive(:exitstatus).and_return(status)
403
394
  expect(provider.debian_enabled?).to eq(:true)
404
395
  end
405
396
  end
@@ -407,17 +398,17 @@ Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= a
407
398
  [101, 105].each do |status|
408
399
  it "should return true when status is #{status} and there are at least 4 start links" do
409
400
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
410
- provider.stubs(:system)
411
- provider.expects(:get_start_link_count).returns(4)
412
- $CHILD_STATUS.expects(:exitstatus).twice.returns(status)
401
+ allow(provider).to receive(:system)
402
+ expect(provider).to receive(:get_start_link_count).and_return(4)
403
+ expect($CHILD_STATUS).to receive(:exitstatus).twice.and_return(status)
413
404
  expect(provider.debian_enabled?).to eq(:true)
414
405
  end
415
406
 
416
407
  it "should return false when status is #{status} and there are less than 4 start links" do
417
408
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
418
- provider.stubs(:system)
419
- provider.expects(:get_start_link_count).returns(1)
420
- $CHILD_STATUS.expects(:exitstatus).twice.returns(status)
409
+ allow(provider).to receive(:system)
410
+ expect(provider).to receive(:get_start_link_count).and_return(1)
411
+ expect($CHILD_STATUS).to receive(:exitstatus).twice.and_return(status)
421
412
  expect(provider.debian_enabled?).to eq(:false)
422
413
  end
423
414
  end
@@ -426,13 +417,13 @@ Jun 14 21:43:23 foo.example.com systemd[1]: sshd.service lacks both ExecStart= a
426
417
  describe "#get_start_link_count" do
427
418
  it "should strip the '.service' from the search if present in the resource name" do
428
419
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd.service'))
429
- Dir.expects(:glob).with("/etc/rc*.d/S??sshd").returns(['files'])
420
+ expect(Dir).to receive(:glob).with("/etc/rc*.d/S??sshd").and_return(['files'])
430
421
  provider.get_start_link_count
431
422
  end
432
423
 
433
424
  it "should use the full service name if it does not include '.service'" do
434
425
  provider = provider_class.new(Puppet::Type.type(:service).new(:name => 'sshd'))
435
- Dir.expects(:glob).with("/etc/rc*.d/S??sshd").returns(['files'])
426
+ expect(Dir).to receive(:glob).with("/etc/rc*.d/S??sshd").and_return(['files'])
436
427
  provider.get_start_link_count
437
428
  end
438
429
  end