Skip to content

Commit 0b8c976

Browse files
committed
(PUP-11764) Remove unnecessary test
puppet-agent already tests that the agent can connect to the forge to verify TLS compatibility and that the forge cert is trusted by the agent's CA bundle.
1 parent 07cb4ca commit 0b8c976

File tree

2 files changed

+0
-22
lines changed

2 files changed

+0
-22
lines changed

acceptance/lib/puppet/acceptance/environment_utils.rb

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -257,18 +257,6 @@ def use_an_environment(environment, description, master_opts, envdir, confdir, o
257257
on(master, puppet(*(["apply", '-e', '"include testing_mod"'] + args)), :acceptable_exit_codes => (0..255)) do
258258
agent_results[:puppet_apply] = result
259259
end
260-
261-
# Be aware that Puppet Module Tool will create the module directory path if it
262-
# does not exist. So these tests should be run last...
263-
step "install a module into environment"
264-
on(master, puppet(*(["module", "install", "pmtacceptance-nginx"] + args)), :acceptable_exit_codes => (0..255)) do
265-
agent_results[:puppet_module_install] = result
266-
end
267-
268-
step "uninstall a module from #{description} environment"
269-
on(master, puppet(*(["module", "uninstall", "pmtacceptance-nginx"] + args)), :acceptable_exit_codes => (0..255)) do
270-
agent_results[:puppet_module_uninstall] = result
271-
end
272260
end
273261
end
274262
end

acceptance/tests/environment/environment_scenario-bad.rb

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222
step 'setup environments'
2323

24-
stub_forge_on(master)
25-
2624
testdir = create_tmpdir_for_user(master, 'confdir')
2725
puppet_conf_backup_dir = create_tmpdir_for_user(master, "puppet-conf-backup-dir")
2826

@@ -47,14 +45,6 @@
4745
%r{manifest =},
4846
%r{config_version =}],
4947
},
50-
:puppet_module_install => {
51-
:exit_code => 1,
52-
:matches => [%r{Could not find a directory environment named '#{env}' anywhere in the path.*#{env_path}}],
53-
},
54-
:puppet_module_uninstall => {
55-
:exit_code => 1,
56-
:matches => [%r{Could not find a directory environment named '#{env}' anywhere in the path.*#{env_path}}],
57-
},
5848
:puppet_apply => {
5949
:exit_code => 1,
6050
:matches => [%r{Could not find a directory environment named '#{env}' anywhere in the path.*#{env_path}}],

0 commit comments

Comments
 (0)