diff --git a/acceptance/tests/environment/environment_scenario-master_environmentpath.rb b/acceptance/tests/environment/environment_scenario-master_environmentpath.rb index 1b407905c..e922b1cf3 100644 --- a/acceptance/tests/environment/environment_scenario-master_environmentpath.rb +++ b/acceptance/tests/environment/environment_scenario-master_environmentpath.rb @@ -1,65 +1,62 @@ test_name "Test behavior of a directory environment when environmentpath is set in the master section" require 'puppet/acceptance/environment_utils' extend Puppet::Acceptance::EnvironmentUtils require 'puppet/acceptance/classifier_utils' extend Puppet::Acceptance::ClassifierUtils classify_nodes_as_agent_specified_if_classifer_present step "setup environments" stub_forge_on(master) testdir = create_tmpdir_for_user master, "confdir" puppet_conf_backup_dir = create_tmpdir_for_user(master, "puppet-conf-backup-dir") apply_manifest_on(master, environment_manifest(testdir), :catch_failures => true) step "Test" master_opts = { - 'main' => { - 'environmentpath' => '', - }, 'master' => { 'environmentpath' => '$confdir/environments', } } env = 'testing' results = use_an_environment("testing", "master environmentpath", master_opts, testdir, puppet_conf_backup_dir, :directory_environments => true, :config_print => '--section=master') expectations = { :puppet_config => { :exit_code => 0, :matches => [%r{manifest.*#{master['puppetpath']}/environments/#{env}/manifests$}, %r{modulepath.*#{master['puppetpath']}/environments/#{env}/modules:.+}, %r{config_version = $}] }, :puppet_module_install => { :exit_code => 0, :matches => [%r{Preparing to install into #{master['puppetpath']}/modules}, %r{pmtacceptance-nginx}], :expect_failure => true, :notes => "Runs in user mode and doesn't see the master environmenetpath setting.", }, :puppet_module_uninstall => { :exit_code => 0, :matches => [%r{Removed.*pmtacceptance-nginx.*from #{master['puppetpath']}/modules}], :expect_failure => true, :notes => "Runs in user mode and doesn't see the master environmenetpath setting.", }, :puppet_apply => { :exit_code => 0, :matches => [%r{include default environment testing_mod}], :expect_failure => true, :notes => "Runs in user mode and doesn't see the master environmenetpath setting.", }, :puppet_agent => { :exit_code => 2, :matches => [%r{Applying configuration version '\d+'}, %r{in directory #{env} environment site.pp}, %r{include directory #{env} environment testing_mod}], }, } review_results(results,expectations)