diff --git a/acceptance/tests/modules/install/already_installed.rb b/acceptance/tests/modules/install/already_installed.rb
index 70abc8506..ab7d467b8 100644
--- a/acceptance/tests/modules/install/already_installed.rb
+++ b/acceptance/tests/modules/install/already_installed.rb
@@ -1,63 +1,63 @@
begin test_name "puppet module install (already installed)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
apply_manifest_on master, <<-PP
file {
[
'/etc/puppet/modules/nginx',
]: ensure => directory;
'/etc/puppet/modules/nginx/metadata.json':
content => '{
"name": "pmtacceptance/nginx",
"version": "0.0.1",
"source": "",
"author": "pmtacceptance",
"license": "MIT",
"dependencies": []
}';
}
PP
step "Try to install a module that is already installed"
on master, puppet("module install pmtacceptance-nginx"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-nginx' (latest)
STDERR> Module 'pmtacceptance-nginx' (v0.0.1) is already installed
STDERR> Use `puppet module upgrade` to install a different version
STDERR> Use `puppet module install --force` to re-install only this module\e[0m
OUTPUT
end
on master, '[ -d /etc/puppet/modules/nginx ]'
step "Try to install a specific version of a module that is already installed"
on master, puppet("module install pmtacceptance-nginx --version 1.x"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-nginx' (v1.x)
STDERR> Module 'pmtacceptance-nginx' (v0.0.1) is already installed
STDERR> Use `puppet module upgrade` to install a different version
STDERR> Use `puppet module install --force` to re-install only this module\e[0m
OUTPUT
end
on master, '[ -d /etc/puppet/modules/nginx ]'
step "Install a module that is already installed (with --force)"
on master, puppet("module install pmtacceptance-nginx --force") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-nginx (\e[0;36mv0.0.1\e[0m)
OUTPUT
end
on master, '[ -d /etc/puppet/modules/nginx ]'
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { '/etc/puppet/modules': recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/install/already_installed_elsewhere.rb b/acceptance/tests/modules/install/already_installed_elsewhere.rb
index eee1a5f1c..aef9ce5fc 100644
--- a/acceptance/tests/modules/install/already_installed_elsewhere.rb
+++ b/acceptance/tests/modules/install/already_installed_elsewhere.rb
@@ -1,66 +1,66 @@
begin test_name "puppet module install (already installed elsewhere)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
apply_manifest_on master, <<-PP
file {
[
'/etc/puppet/modules',
'/usr/share/puppet',
'/usr/share/puppet/modules',
'/usr/share/puppet/modules/nginx',
]: ensure => directory;
'/usr/share/puppet/modules/nginx/metadata.json':
content => '{
"name": "pmtacceptance/nginx",
"version": "0.0.1",
"source": "",
"author": "pmtacceptance",
"license": "MIT",
"dependencies": []
}';
}
PP
step "Try to install a module that is already installed"
on master, puppet("module install pmtacceptance-nginx"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-nginx' (latest)
STDERR> Module 'pmtacceptance-nginx' (v0.0.1) is already installed
STDERR> Use `puppet module upgrade` to install a different version
STDERR> Use `puppet module install --force` to re-install only this module\e[0m
OUTPUT
end
on master, '[ ! -d /etc/puppet/modules/nginx ]'
step "Try to install a specific version of a module that is already installed"
on master, puppet("module install pmtacceptance-nginx --version 1.x"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-nginx' (v1.x)
STDERR> Module 'pmtacceptance-nginx' (v0.0.1) is already installed
STDERR> Use `puppet module upgrade` to install a different version
STDERR> Use `puppet module install --force` to re-install only this module\e[0m
OUTPUT
end
on master, '[ ! -d /etc/puppet/modules/nginx ]'
step "Install a module that is already installed (with --force)"
on master, puppet("module install pmtacceptance-nginx --force") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-nginx (\e[0;36mv0.0.1\e[0m)
OUTPUT
end
on master, '[ -d /etc/puppet/modules/nginx ]'
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { '/etc/puppet/modules': recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/install/already_installed_with_local_changes.rb b/acceptance/tests/modules/install/already_installed_with_local_changes.rb
index 55b46c477..9e97b8d6b 100644
--- a/acceptance/tests/modules/install/already_installed_with_local_changes.rb
+++ b/acceptance/tests/modules/install/already_installed_with_local_changes.rb
@@ -1,70 +1,70 @@
begin test_name "puppet module install (already installed with local changes)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
apply_manifest_on master, <<-PP
file {
[
'/etc/puppet/modules/nginx',
]: ensure => directory;
'/etc/puppet/modules/nginx/metadata.json':
content => '{
"name": "pmtacceptance/nginx",
"version": "0.0.1",
"source": "",
"author": "pmtacceptance",
"license": "MIT",
"checksums": {
"README": "2a3adc3b053ef1004df0a02cefbae31f"
},
"dependencies": []
}';
'/etc/puppet/modules/nginx/README':
content => 'Nginx module';
}
PP
step "Try to install a module that is already installed"
on master, puppet("module install pmtacceptance-nginx"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-nginx' (latest)
STDERR> Module 'pmtacceptance-nginx' (v0.0.1) is already installed
STDERR> Installed module has had changes made locally
STDERR> Use `puppet module upgrade` to install a different version
STDERR> Use `puppet module install --force` to re-install only this module\e[0m
OUTPUT
end
on master, '[ -d /etc/puppet/modules/nginx ]'
step "Try to install a specific version of a module that is already installed"
on master, puppet("module install pmtacceptance-nginx --version 1.x"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-nginx' (v1.x)
STDERR> Module 'pmtacceptance-nginx' (v0.0.1) is already installed
STDERR> Installed module has had changes made locally
STDERR> Use `puppet module upgrade` to install a different version
STDERR> Use `puppet module install --force` to re-install only this module\e[0m
OUTPUT
end
on master, '[ -d /etc/puppet/modules/nginx ]'
step "Install a module that is already installed (with --force)"
on master, puppet("module install pmtacceptance-nginx --force") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-nginx (\e[0;36mv0.0.1\e[0m)
OUTPUT
end
on master, '[ -d /etc/puppet/modules/nginx ]'
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { '/etc/puppet/modules': recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/install/force_ignores_dependencies.rb b/acceptance/tests/modules/install/force_ignores_dependencies.rb
index a8feea158..8ca013a5d 100644
--- a/acceptance/tests/modules/install/force_ignores_dependencies.rb
+++ b/acceptance/tests/modules/install/force_ignores_dependencies.rb
@@ -1,40 +1,40 @@
begin test_name "puppet module install (force ignores dependencies)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
step "Try to install an unsatisfiable module"
on master, puppet("module install pmtacceptance-php"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-php' (latest: v0.0.2)
STDERR> No version of 'pmtacceptance-php' will satisfy dependencies
STDERR> You specified 'pmtacceptance-php' (latest: v0.0.2),
STDERR> which depends on 'pmtacceptance-apache' (v0.0.1),
STDERR> which depends on 'pmtacceptance-php' (v0.0.1)
STDERR> Use `puppet module install --force` to install this module anyway\e[0m
OUTPUT
end
on master, '[ ! -d /etc/puppet/modules/php ]'
on master, '[ ! -d /etc/puppet/modules/apache ]'
step "Install an unsatisfiable module with force"
on master, puppet("module install pmtacceptance-php --force") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-php (\e[0;36mv0.0.2\e[0m)
OUTPUT
end
on master, '[ -d /etc/puppet/modules/php ]'
on master, '[ ! -d /etc/puppet/modules/apache ]'
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { '/etc/puppet/modules': recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/install/ignoring_dependencies.rb b/acceptance/tests/modules/install/ignoring_dependencies.rb
index 791383354..5f82ffe63 100644
--- a/acceptance/tests/modules/install/ignoring_dependencies.rb
+++ b/acceptance/tests/modules/install/ignoring_dependencies.rb
@@ -1,24 +1,24 @@
begin test_name "puppet module install (ignoring dependencies)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
step "Install a module, but ignore dependencies"
on master, puppet("module install pmtacceptance-java --ignore-dependencies") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-java (\e[0;36mv1.7.1\e[0m)
OUTPUT
end
on master, '[ -d /etc/puppet/modules/java ]'
on master, '[ ! -d /etc/puppet/modules/stdlib ]'
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { '/etc/puppet/modules': recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/install/nonexistent_directory.rb b/acceptance/tests/modules/install/nonexistent_directory.rb
index 6789a86c3..b9c5f3b28 100644
--- a/acceptance/tests/modules/install/nonexistent_directory.rb
+++ b/acceptance/tests/modules/install/nonexistent_directory.rb
@@ -1,40 +1,40 @@
begin test_name "puppet module install (nonexistent directory)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
apply_manifest_on master, <<-PP
file {
[
'/etc/puppet/modules',
'/tmp/modules',
]: ensure => absent, recurse => true, force => true;
}
PP
step "Try to install a module to a non-existent directory"
on master, puppet("module install pmtacceptance-nginx --target-dir /tmp/modules"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /tmp/modules ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-nginx' (latest)
STDERR> Directory /tmp/modules does not exist\e[0m
OUTPUT
end
on master, '[ ! -d /etc/puppet/modules/nginx ]'
step "Try to install a module to a non-existent implicit directory"
on master, puppet("module install pmtacceptance-nginx"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-nginx' (latest)
STDERR> Directory /etc/puppet/modules does not exist\e[0m
OUTPUT
end
on master, '[ ! -d /etc/puppet/modules/nginx ]'
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { '/etc/puppet/modules': ensure => directory }"
apply_manifest_on master, "file { '/etc/puppet/modules': recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/install/with_cycles.rb b/acceptance/tests/modules/install/with_cycles.rb
index d7d27bd04..de68ee3c8 100644
--- a/acceptance/tests/modules/install/with_cycles.rb
+++ b/acceptance/tests/modules/install/with_cycles.rb
@@ -1,32 +1,32 @@
begin test_name "puppet module install (with cycles)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
step "Install a module with cycles"
on master, puppet("module install pmtacceptance-php --version 0.0.1") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└─┬ pmtacceptance-php (\e[0;36mv0.0.1\e[0m)
└── pmtacceptance-apache (\e[0;36mv0.0.1\e[0m)
OUTPUT
end
on master, puppet('module list') do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-apache (\e[0;36mv0.0.1\e[0m)
└── pmtacceptance-php (\e[0;36mv0.0.1\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/install/with_dependencies.rb b/acceptance/tests/modules/install/with_dependencies.rb
index f0d87f6b7..0f41c7ef1 100644
--- a/acceptance/tests/modules/install/with_dependencies.rb
+++ b/acceptance/tests/modules/install/with_dependencies.rb
@@ -1,25 +1,25 @@
begin test_name "puppet module install (with dependencies)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
step "Install a module with dependencies"
on master, puppet("module install pmtacceptance-java") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└─┬ pmtacceptance-java (\e[0;36mv1.7.1\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
OUTPUT
end
on master, '[ -d /etc/puppet/modules/java ]'
on master, '[ -d /etc/puppet/modules/stdlib ]'
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/install/with_existing_module_directory.rb b/acceptance/tests/modules/install/with_existing_module_directory.rb
index a21fbd1b6..10fe9d31e 100644
--- a/acceptance/tests/modules/install/with_existing_module_directory.rb
+++ b/acceptance/tests/modules/install/with_existing_module_directory.rb
@@ -1,96 +1,96 @@
begin test_name "puppet module install (with existing module directory)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
apply_manifest_on master, <<-PP
file {
[
'/etc/puppet/modules/nginx',
'/etc/puppet/modules/apache',
]: ensure => directory;
'/etc/puppet/modules/nginx/metadata.json':
content => '{
"name": "notpmtacceptance/nginx",
"version": "0.0.3",
"source": "",
"author": "notpmtacceptance",
"license": "MIT",
"dependencies": []
}';
[
'/etc/puppet/modules/nginx/extra.json',
'/etc/puppet/modules/apache/extra.json',
]: content => '';
}
PP
step "Try to install an module with a name collision"
on master, puppet("module install pmtacceptance-nginx"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-nginx' (latest: v0.0.1)
STDERR> Installation would overwrite /etc/puppet/modules/nginx
STDERR> Currently, 'notpmtacceptance-nginx' (v0.0.3) is installed to that directory
STDERR> Use `puppet module install --dir
` to install modules elsewhere
STDERR> Use `puppet module install --force` to install this module anyway\e[0m
OUTPUT
end
on master, '[ -f /etc/puppet/modules/nginx/extra.json ]'
step "Try to install an module with a path collision"
on master, puppet("module install pmtacceptance-apache"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-apache' (latest: v0.0.1)
STDERR> Installation would overwrite /etc/puppet/modules/apache
STDERR> Use `puppet module install --dir ` to install modules elsewhere
STDERR> Use `puppet module install --force` to install this module anyway\e[0m
OUTPUT
end
on master, '[ -f /etc/puppet/modules/apache/extra.json ]'
step "Try to install an module with a dependency that has collides"
on master, puppet("module install pmtacceptance-php --version 0.0.1"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-php' (v0.0.1)
STDERR> Dependency 'pmtacceptance-apache' (v0.0.1) would overwrite /etc/puppet/modules/apache
STDERR> Use `puppet module install --dir ` to install modules elsewhere
STDERR> Use `puppet module install --ignore-dependencies` to install only this module\e[0m
OUTPUT
end
on master, '[ -f /etc/puppet/modules/apache/extra.json ]'
step "Install an module with a name collision by using --force"
on master, puppet("module install pmtacceptance-nginx --force"), :acceptable_exit_codes => [0] do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-nginx (\e[0;36mv0.0.1\e[0m)
OUTPUT
end
on master, '[ ! -f /etc/puppet/modules/nginx/extra.json ]'
step "Install an module with a name collision by using --force"
on master, puppet("module install pmtacceptance-apache --force"), :acceptable_exit_codes => [0] do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-apache (\e[0;36mv0.0.1\e[0m)
OUTPUT
end
on master, '[ ! -f /etc/puppet/modules/apache/extra.json ]'
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { '/etc/puppet/modules': recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/install/with_necessary_upgrade.rb b/acceptance/tests/modules/install/with_necessary_upgrade.rb
index 453dbf147..0e6915cc0 100644
--- a/acceptance/tests/modules/install/with_necessary_upgrade.rb
+++ b/acceptance/tests/modules/install/with_necessary_upgrade.rb
@@ -1,55 +1,55 @@
begin test_name "puppet module install (with necessary dependency upgrade)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
step "Install an older module version"
on master, puppet("module install pmtacceptance-java --version 1.6.0") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└─┬ pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
OUTPUT
end
on master, puppet('module list --tree') do
assert_output <<-OUTPUT
/etc/puppet/modules
└─┬ pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
step "Install a module that requires the older module dependency be upgraded"
on master, puppet("module install pmtacceptance-apollo") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└─┬ pmtacceptance-apollo (\e[0;36mv0.0.1\e[0m)
└── pmtacceptance-java (\e[0;36mv1.6.0 -> v1.7.1\e[0m)
OUTPUT
end
on master, puppet('module list') do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-apollo (\e[0;36mv0.0.1\e[0m)
├── pmtacceptance-java (\e[0;36mv1.7.1\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/install/with_no_dependencies.rb b/acceptance/tests/modules/install/with_no_dependencies.rb
index ca2aa1d3a..24f202d64 100644
--- a/acceptance/tests/modules/install/with_no_dependencies.rb
+++ b/acceptance/tests/modules/install/with_no_dependencies.rb
@@ -1,23 +1,23 @@
begin test_name "puppet module install (with no dependencies)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
step "Install a module with no dependencies"
on master, puppet("module install pmtacceptance-nginx") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-nginx (\e[0;36mv0.0.1\e[0m)
OUTPUT
end
on master, '[ -d /etc/puppet/modules/nginx ]'
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/install/with_unnecessary_upgrade.rb b/acceptance/tests/modules/install/with_unnecessary_upgrade.rb
index 532f1f012..d6f63c80d 100644
--- a/acceptance/tests/modules/install/with_unnecessary_upgrade.rb
+++ b/acceptance/tests/modules/install/with_unnecessary_upgrade.rb
@@ -1,54 +1,54 @@
begin test_name "puppet module install (with unnecessary dependency upgrade)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
step "Install an older module version"
on master, puppet("module install pmtacceptance-java --version 1.7.0") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└─┬ pmtacceptance-java (\e[0;36mv1.7.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
OUTPUT
end
on master, puppet('module list') do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-java (\e[0;36mv1.7.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
step "Install a module that depends on a dependency that could be upgraded, but already satisfies constraints"
on master, puppet("module install pmtacceptance-apollo") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-apollo (\e[0;36mv0.0.1\e[0m)
OUTPUT
end
on master, puppet('module list') do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-apollo (\e[0;36mv0.0.1\e[0m)
├── pmtacceptance-java (\e[0;36mv1.7.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/install/with_unsatisfied_constraints.rb b/acceptance/tests/modules/install/with_unsatisfied_constraints.rb
index 16ddd1c34..50c0f54d5 100644
--- a/acceptance/tests/modules/install/with_unsatisfied_constraints.rb
+++ b/acceptance/tests/modules/install/with_unsatisfied_constraints.rb
@@ -1,97 +1,97 @@
begin test_name "puppet module install (with unsatisfied constraints)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
apply_manifest_on master, <<-PP
file {
[
'/etc/puppet/modules/crakorn',
]: ensure => directory;
'/etc/puppet/modules/crakorn/metadata.json':
content => '{
"name": "jimmy/crakorn",
"version": "0.0.1",
"source": "",
"author": "jimmy",
"license": "MIT",
"dependencies": [
{ "name": "pmtacceptance/stdlib", "version_requirement": "1.x" }
]
}';
}
PP
step "Try to install a module that has an unsatisfiable dependency"
on master, puppet("module install pmtacceptance-git"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-git' (latest: v0.0.1)
STDERR> No version of 'pmtacceptance-stdlib' will satisfy dependencies
STDERR> 'jimmy-crakorn' (v0.0.1) requires 'pmtacceptance-stdlib' (v1.x)
STDERR> 'pmtacceptance-git' (v0.0.1) requires 'pmtacceptance-stdlib' (>= 2.0.0)
STDERR> Use `puppet module install --ignore-dependencies` to install only this module\e[0m
OUTPUT
end
on master, '[ ! -d /etc/puppet/modules/git ]'
step "Install the module with an unsatisfiable dependency"
on master, puppet("module install pmtacceptance-git --ignore-dependencies") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-git (\e[0;36mv0.0.1\e[0m)
OUTPUT
end
on master, '[ -d /etc/puppet/modules/git ]'
step "Try to install a specific version of the unsatisfiable dependency"
on master, puppet("module install pmtacceptance-stdlib --version 1.x"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-stdlib' (v1.x)
STDERR> No version of 'pmtacceptance-stdlib' will satisfy dependencies
STDERR> You specified 'pmtacceptance-stdlib' (v1.x)
STDERR> 'jimmy-crakorn' (v0.0.1) requires 'pmtacceptance-stdlib' (v1.x)
STDERR> 'pmtacceptance-git' (v0.0.1) requires 'pmtacceptance-stdlib' (>= 2.0.0)
STDERR> Use `puppet module install --force` to install this module anyway\e[0m
OUTPUT
end
on master, '[ ! -d /etc/puppet/modules/stdlib ]'
step "Try to install any version of the unsatisfiable dependency"
on master, puppet("module install pmtacceptance-stdlib"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to install into /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not install module 'pmtacceptance-stdlib' (best: v1.0.0)
STDERR> No version of 'pmtacceptance-stdlib' will satisfy dependencies
STDERR> You specified 'pmtacceptance-stdlib' (best: v1.0.0)
STDERR> 'jimmy-crakorn' (v0.0.1) requires 'pmtacceptance-stdlib' (v1.x)
STDERR> 'pmtacceptance-git' (v0.0.1) requires 'pmtacceptance-stdlib' (>= 2.0.0)
STDERR> Use `puppet module install --force` to install this module anyway\e[0m
OUTPUT
end
on master, '[ ! -d /etc/puppet/modules/stdlib ]'
step "Install the unsatisfiable dependency with --force"
on master, puppet("module install pmtacceptance-stdlib --force") do
assert_output <<-OUTPUT
Preparing to install into /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Installing -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
OUTPUT
end
on master, '[ -d /etc/puppet/modules/stdlib ]'
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { '/etc/puppet/modules': recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/search/by_description.rb b/acceptance/tests/modules/search/by_description.rb
index a1acfb8a4..b36494334 100644
--- a/acceptance/tests/modules/search/by_description.rb
+++ b/acceptance/tests/modules/search/by_description.rb
@@ -1,28 +1,28 @@
begin test_name 'puppet module search should do substring matches on description'
step 'Stub http://forge.puppetlabs.com'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
step 'Search for a module by description'
on master, puppet("module search dummy") do
assert_equal '', stderr
# FIXME: The Forge does not presently match against description.
# assert_equal <<-STDOUT, stdout
# Searching http://forge.puppetlabs.com ...
# NAME DESCRIPTION AUTHOR KEYWORDS
# pmtacceptance-nginx This is a dummy nginx mo... @pmtacceptance nginx
# pmtacceptance-thin This is a dummy thin mod... @pmtacceptance ruby thin
# pmtacceptance-apollo This is a dummy apollo m... @pmtacceptance stomp apollo
# pmtacceptance-java This is a dummy java mod... @pmtacceptance java
# pmtacceptance-stdlib This is a dummy stdlib m... @pmtacceptance stdlib libs
# pmtacceptance-git This is a dummy git modu... @pmtacceptance git dvcs
# pmtacceptance-apache This is a dummy apache m... @pmtacceptance apache php
# pmtacceptance-php This is a dummy php modu... @pmtacceptance apache php
# pmtacceptance-geordi This is a module that do... @pmtacceptance star trek
# STDOUT
end
ensure step 'Unstub http://forge.puppetlabs.com'
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
end
diff --git a/acceptance/tests/modules/search/by_keyword.rb b/acceptance/tests/modules/search/by_keyword.rb
index 93323d8d4..870d1fa19 100644
--- a/acceptance/tests/modules/search/by_keyword.rb
+++ b/acceptance/tests/modules/search/by_keyword.rb
@@ -1,29 +1,29 @@
begin test_name 'puppet module search should do exact keyword matches'
step 'Stub http://forge.puppetlabs.com'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
step 'Search for a module by exact keyword'
on master, puppet("module search github") do
assert_equal '', stderr
assert_equal <<-STDOUT, stdout
Searching http://forge.puppetlabs.com ...
NAME DESCRIPTION AUTHOR KEYWORDS
pmtacceptance-git This is a dummy git module... @pmtacceptance git \e[0;32mgithub\e[0m
STDOUT
end
# FIXME: The Forge presently matches partial keywords.
# step 'Search for a module by partial keyword'
# on master, puppet("module search hub") do
# assert_equal '', stderr
# assert_equal <<-STDOUT, stdout
# Searching http://forge.puppetlabs.com ...
# No results found for 'hub'.
# STDOUT
# end
ensure step 'Unstub http://forge.puppetlabs.com'
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
end
diff --git a/acceptance/tests/modules/search/by_module_name.rb b/acceptance/tests/modules/search/by_module_name.rb
index be528e99f..cd03ced09 100644
--- a/acceptance/tests/modules/search/by_module_name.rb
+++ b/acceptance/tests/modules/search/by_module_name.rb
@@ -1,40 +1,40 @@
begin test_name 'puppet module search should do substring matches on module name'
step 'Stub http://forge.puppetlabs.com'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
step 'Search for modules by partial name'
on master, puppet("module search geordi") do
assert_equal '', stderr
assert_equal <<-STDOUT, stdout
Searching http://forge.puppetlabs.com ...
NAME DESCRIPTION AUTHOR KEYWORDS
pmtacceptance-\e[0;32mgeordi\e[0m This is a module that do... @pmtacceptance star trek
STDOUT
end
# FIXME: The Forge does not presently support matches by dashed full name.
# step 'Search for modules by partial full name (dashed)'
# on master, puppet("module search tance-ge") do
# assert_equal '', stderr
# assert_equal <<-STDOUT, stdout
# Searching http://forge.puppetlabs.com ...
# NAME DESCRIPTION AUTHOR KEYWORDS
# pmtacceptance-geordi This is a module that do... @pmtacceptance star trek
# STDOUT
# end
step 'Search for modules by partial full name (slashed)'
on master, puppet("module search tance/ge") do
assert_equal '', stderr
assert_equal <<-STDOUT, stdout
Searching http://forge.puppetlabs.com ...
NAME DESCRIPTION AUTHOR KEYWORDS
pmtaccep\e[0;32mtance-ge\e[0mordi This is a module that do... @pmtacceptance star trek
STDOUT
end
ensure step 'Unstub http://forge.puppetlabs.com'
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
end
diff --git a/acceptance/tests/modules/search/formatting.rb b/acceptance/tests/modules/search/formatting.rb
index c196af9b0..d5ab0f137 100644
--- a/acceptance/tests/modules/search/formatting.rb
+++ b/acceptance/tests/modules/search/formatting.rb
@@ -1,22 +1,22 @@
begin test_name 'puppet module search output should be well structured'
step 'Stub http://forge.puppetlabs.com'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
step 'Search results should line up by column'
on master, puppet("module search apache") do
assert_equal('', stderr)
assert_equal "Searching http://forge.puppetlabs.com ...\n", stdout.lines.first
columns = stdout.lines.to_a[1].split(/\s{2}(?=\S)/)
pattern = /^#{ columns.map { |c| c.chomp.gsub(/./, '.') }.join(' ') }$/
stdout.gsub(/\e.*?m/, '').lines.to_a[1..-1].each do |line|
assert_match(pattern, line.chomp, 'columns were misaligned')
end
end
ensure step 'Unstub http://forge.puppetlabs.com'
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
end
diff --git a/acceptance/tests/modules/search/multiple_search_terms.rb b/acceptance/tests/modules/search/multiple_search_terms.rb
index 7ba88554b..468a22402 100644
--- a/acceptance/tests/modules/search/multiple_search_terms.rb
+++ b/acceptance/tests/modules/search/multiple_search_terms.rb
@@ -1,25 +1,25 @@
begin test_name 'puppet module search should handle multiple search terms sensibly'
step 'Stub http://forge.puppetlabs.com'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
# FIXME: The Forge doesn't properly handle multi-term searches.
# step 'Search for a module by description'
# on master, puppet("module search 'notice here'") do
# assert stdout !~ /'notice here'/
# end
#
# step 'Search for a module by name'
# on master, puppet("module search 'ance-geo ance-std'") do
# assert stdout !~ /'ance-geo ance-std'/
# end
#
# step 'Search for multiple keywords'
# on master, puppet("module search 'star trek'") do
# assert stdout !~ /'star trek'/
# end
ensure step 'Unstub http://forge.puppetlabs.com'
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
end
diff --git a/acceptance/tests/modules/search/no_results.rb b/acceptance/tests/modules/search/no_results.rb
index 7d8ee887a..57a2cd2ac 100644
--- a/acceptance/tests/modules/search/no_results.rb
+++ b/acceptance/tests/modules/search/no_results.rb
@@ -1,18 +1,18 @@
begin test_name 'puppet module search should print a reasonable message for no results'
step 'Stub http://forge.puppetlabs.com'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
step "Search for a module that doesn't exist"
on master, puppet("module search module_not_appearing_in_this_forge") do
assert_equal '', stderr
assert_equal <<-STDOUT, stdout
Searching http://forge.puppetlabs.com ...
No results found for 'module_not_appearing_in_this_forge'.
STDOUT
end
ensure step 'Unstub http://forge.puppetlabs.com'
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
end
diff --git a/acceptance/tests/modules/uninstall/with_multiple_modules_installed.rb b/acceptance/tests/modules/uninstall/with_multiple_modules_installed.rb
index 37309aa01..d75a8cf3b 100644
--- a/acceptance/tests/modules/uninstall/with_multiple_modules_installed.rb
+++ b/acceptance/tests/modules/uninstall/with_multiple_modules_installed.rb
@@ -1,43 +1,43 @@
begin test_name "puppet module uninstall (with multiple modules installed)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
on master, puppet("module install pmtacceptance-java --version 1.6.0 --modulepath /etc/puppet/modules")
on master, puppet("module install pmtacceptance-java --version 1.7.0 --modulepath /usr/share/puppet/modules")
on master, puppet("module list") do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
/usr/share/puppet/modules
├── pmtacceptance-java (\e[0;36mv1.7.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
OUTPUT
end
step "Try to uninstall a module that exists multiple locations in the module path"
on master, puppet("module uninstall pmtacceptance-java"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to uninstall 'pmtacceptance-java' ...
STDERR> \e[1;31mError: Could not uninstall module 'pmtacceptance-java'
STDERR> Module 'pmtacceptance-java' appears multiple places in the module path
STDERR> 'pmtacceptance-java' (v1.6.0) was found in /etc/puppet/modules
STDERR> 'pmtacceptance-java' (v1.7.0) was found in /usr/share/puppet/modules
STDERR> Use the `--modulepath` option to limit the search to specific directories\e[0m
OUTPUT
end
step "Uninstall a module that exists multiple locations by restricting the --modulepath"
on master, puppet("module uninstall pmtacceptance-java --modulepath /etc/puppet/modules") do
assert_output <<-OUTPUT
Preparing to uninstall 'pmtacceptance-java' ...
Removed 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) from /etc/puppet/modules
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/upgrade/in_a_secondary_directory.rb b/acceptance/tests/modules/upgrade/in_a_secondary_directory.rb
index 08ecf9151..a72a80491 100644
--- a/acceptance/tests/modules/upgrade/in_a_secondary_directory.rb
+++ b/acceptance/tests/modules/upgrade/in_a_secondary_directory.rb
@@ -1,42 +1,42 @@
begin test_name "puppet module upgrade (in a secondary directory)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, <<-'MANIFEST1'
file { '/usr/share/puppet':
ensure => directory,
}
file { ['/etc/puppet/modules', '/usr/share/puppet/modules']:
ensure => directory,
recurse => true,
purge => true,
force => true,
}
MANIFEST1
on master, puppet("module install pmtacceptance-java --version 1.6.0 --target-dir /usr/share/puppet/modules")
on master, puppet("module list") do
assert_output <<-OUTPUT
/etc/puppet/modules (no modules installed)
/usr/share/puppet/modules
├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
OUTPUT
end
step "Upgrade a module that has a more recent version published"
on master, puppet("module upgrade pmtacceptance-java") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-java' ...
Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) in /usr/share/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/usr/share/puppet/modules
└── pmtacceptance-java (\e[0;36mv1.6.0 -> v1.7.1\e[0m)
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/upgrade/introducing_new_dependencies.rb b/acceptance/tests/modules/upgrade/introducing_new_dependencies.rb
index fb4188a88..4974d744a 100644
--- a/acceptance/tests/modules/upgrade/introducing_new_dependencies.rb
+++ b/acceptance/tests/modules/upgrade/introducing_new_dependencies.rb
@@ -1,46 +1,46 @@
begin test_name "puppet module upgrade (introducing new dependencies)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, <<-'MANIFEST1'
file { '/usr/share/puppet':
ensure => directory,
}
file { ['/etc/puppet/modules', '/usr/share/puppet/modules']:
ensure => directory,
recurse => true,
purge => true,
force => true,
}
MANIFEST1
on master, puppet("module install pmtacceptance-stdlib --version 1.0.0")
on master, puppet("module install pmtacceptance-java --version 1.7.0")
on master, puppet("module install pmtacceptance-postgresql --version 0.0.2")
on master, puppet("module list") do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-java (\e[0;36mv1.7.0\e[0m)
├── pmtacceptance-postgresql (\e[0;36mv0.0.2\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
step "Upgrade a module to a version that introduces new dependencies"
on master, puppet("module upgrade pmtacceptance-postgresql") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-postgresql' ...
Found 'pmtacceptance-postgresql' (\e[0;36mv0.0.2\e[0m) in /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/etc/puppet/modules
└─┬ pmtacceptance-postgresql (\e[0;36mv0.0.2 -> v1.0.0\e[0m)
└── pmtacceptance-geordi (\e[0;36mv0.0.1\e[0m)
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/upgrade/not_upgradable.rb b/acceptance/tests/modules/upgrade/not_upgradable.rb
index 051d93a24..781eb02b8 100644
--- a/acceptance/tests/modules/upgrade/not_upgradable.rb
+++ b/acceptance/tests/modules/upgrade/not_upgradable.rb
@@ -1,92 +1,92 @@
begin test_name "puppet module upgrade (not upgradable)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, <<-'MANIFEST1'
file { '/usr/share/puppet':
ensure => directory,
}
file { ['/etc/puppet/modules', '/usr/share/puppet/modules']:
ensure => directory,
recurse => true,
purge => true,
force => true,
}
MANIFEST1
apply_manifest_on master, <<-PP
file {
[
'/etc/puppet/modules/nginx',
'/etc/puppet/modules/unicorns',
]: ensure => directory;
'/etc/puppet/modules/unicorns/metadata.json':
content => '{
"name": "notpmtacceptance/unicorns",
"version": "0.0.3",
"source": "",
"author": "notpmtacceptance",
"license": "MIT",
"dependencies": []
}';
}
PP
on master, puppet("module install pmtacceptance-java --version 1.6.0")
on master, puppet("module list") do
assert_output <<-OUTPUT
/etc/puppet/modules
├── nginx (\e[0;36m???\e[0m)
├── notpmtacceptance-unicorns (\e[0;36mv0.0.3\e[0m)
├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
step "Try to upgrade a module that is not installed"
on master, puppet("module upgrade pmtacceptance-nginx"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to upgrade 'pmtacceptance-nginx' ...
STDERR> \e[1;31mError: Could not upgrade module 'pmtacceptance-nginx'
STDERR> Module 'pmtacceptance-nginx' is not installed
STDERR> Use `puppet module install` to install this module\e[0m
OUTPUT
end
step "Try to upgrade a local module"
on master, puppet("module upgrade nginx"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to upgrade 'nginx' ...
STDOUT> Found 'nginx' (\e[0;36m???\e[0m) in /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not upgrade module 'nginx' (??? -> latest)
STDERR> Module 'nginx' does not exist on http://forge.puppetlabs.com\e[0m
OUTPUT
end
step "Try to upgrade a module that doesn't exist"
on master, puppet("module upgrade notpmtacceptance-unicorns"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to upgrade 'notpmtacceptance-unicorns' ...
STDOUT> Found 'notpmtacceptance-unicorns' (\e[0;36mv0.0.3\e[0m) in /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not upgrade module 'notpmtacceptance-unicorns' (v0.0.3 -> latest)
STDERR> Module 'notpmtacceptance-unicorns' does not exist on http://forge.puppetlabs.com\e[0m
OUTPUT
end
step "Try to upgrade an installed module to a version that doesn't exist"
on master, puppet("module upgrade pmtacceptance-java --version 2.0.0"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to upgrade 'pmtacceptance-java' ...
STDOUT> Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) in /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not upgrade module 'pmtacceptance-java' (v1.6.0 -> v2.0.0)
STDERR> No version matching '2.0.0' exists on http://forge.puppetlabs.com\e[0m
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/upgrade/that_was_installed_twice.rb b/acceptance/tests/modules/upgrade/that_was_installed_twice.rb
index 9ce8d3c99..36fd5df27 100644
--- a/acceptance/tests/modules/upgrade/that_was_installed_twice.rb
+++ b/acceptance/tests/modules/upgrade/that_was_installed_twice.rb
@@ -1,57 +1,57 @@
begin test_name "puppet module upgrade (that was installed twice)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, <<-'MANIFEST1'
file { '/usr/share/puppet':
ensure => directory,
}
file { ['/etc/puppet/modules', '/usr/share/puppet/modules']:
ensure => directory,
recurse => true,
purge => true,
force => true,
}
MANIFEST1
on master, puppet("module install pmtacceptance-java --version 1.6.0 --modulepath /etc/puppet/modules")
on master, puppet("module install pmtacceptance-java --version 1.7.0 --modulepath /usr/share/puppet/modules")
on master, puppet("module list") do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
/usr/share/puppet/modules
├── pmtacceptance-java (\e[0;36mv1.7.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
OUTPUT
end
step "Try to upgrade a module that exists multiple locations in the module path"
on master, puppet("module upgrade pmtacceptance-java"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to upgrade 'pmtacceptance-java' ...
STDERR> \e[1;31mError: Could not upgrade module 'pmtacceptance-java'
STDERR> Module 'pmtacceptance-java' appears multiple places in the module path
STDERR> 'pmtacceptance-java' (v1.6.0) was found in /etc/puppet/modules
STDERR> 'pmtacceptance-java' (v1.7.0) was found in /usr/share/puppet/modules
STDERR> Use the `--modulepath` option to limit the search to specific directories\e[0m
OUTPUT
end
step "Upgrade a module that exists multiple locations by restricting the --modulepath"
on master, puppet("module upgrade pmtacceptance-java --modulepath /etc/puppet/modules") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-java' ...
Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) in /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-java (\e[0;36mv1.6.0 -> v1.7.1\e[0m)
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/upgrade/to_a_specific_version.rb b/acceptance/tests/modules/upgrade/to_a_specific_version.rb
index 6d34b0da1..ae5a416ff 100644
--- a/acceptance/tests/modules/upgrade/to_a_specific_version.rb
+++ b/acceptance/tests/modules/upgrade/to_a_specific_version.rb
@@ -1,54 +1,54 @@
begin test_name "puppet module upgrade (to a specific version)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, <<-'MANIFEST1'
file { '/usr/share/puppet':
ensure => directory,
}
file { ['/etc/puppet/modules', '/usr/share/puppet/modules']:
ensure => directory,
recurse => true,
purge => true,
force => true,
}
MANIFEST1
on master, puppet("module install pmtacceptance-java --version 1.6.0")
on master, puppet("module list") do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
step "Upgrade a module to a specific (greater) version"
on master, puppet("module upgrade pmtacceptance-java --version 1.7.0") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-java' ...
Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) in /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-java (\e[0;36mv1.6.0 -> v1.7.0\e[0m)
OUTPUT
end
step "Upgrade a module to a specific (lesser) version"
on master, puppet("module upgrade pmtacceptance-java --version 1.6.0") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-java' ...
Found 'pmtacceptance-java' (\e[0;36mv1.7.0\e[0m) in /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-java (\e[0;36mv1.7.0 -> v1.6.0\e[0m)
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/upgrade/to_installed_version.rb b/acceptance/tests/modules/upgrade/to_installed_version.rb
index 39ad579c1..b3a62071f 100644
--- a/acceptance/tests/modules/upgrade/to_installed_version.rb
+++ b/acceptance/tests/modules/upgrade/to_installed_version.rb
@@ -1,91 +1,91 @@
begin test_name "puppet module upgrade (to installed version)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, <<-'MANIFEST1'
file { '/usr/share/puppet':
ensure => directory,
}
file { ['/etc/puppet/modules', '/usr/share/puppet/modules']:
ensure => directory,
recurse => true,
purge => true,
force => true,
}
MANIFEST1
on master, puppet("module install pmtacceptance-java --version 1.6.0")
on master, puppet("module list") do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
step "Try to upgrade a module to the current version"
on master, puppet("module upgrade pmtacceptance-java --version 1.6.x"), :acceptable_exit_codes => [0] do
assert_output <<-OUTPUT
STDOUT> Preparing to upgrade 'pmtacceptance-java' ...
STDOUT> Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) in /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not upgrade module 'pmtacceptance-java' (v1.6.0 -> v1.6.x)
STDERR> The installed version is already the best fit for the current dependencies
STDERR> You specified 'pmtacceptance-java' (v1.6.x)
STDERR> Use `puppet module install --force` to re-install this module\e[0m
OUTPUT
end
step "Upgrade a module to the current version with --force"
on master, puppet("module upgrade pmtacceptance-java --version 1.6.x --force") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-java' ...
Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) in /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-java (\e[0;36mv1.6.0 -> v1.6.0\e[0m)
OUTPUT
end
step "Upgrade to the latest version"
on master, puppet("module upgrade pmtacceptance-java") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-java' ...
Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) in /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-java (\e[0;36mv1.6.0 -> v1.7.1\e[0m)
OUTPUT
end
step "Try to upgrade a module to the latest version with the latest version installed"
on master, puppet("module upgrade pmtacceptance-java"), :acceptable_exit_codes => [0] do
assert_output <<-OUTPUT
STDOUT> Preparing to upgrade 'pmtacceptance-java' ...
STDOUT> Found 'pmtacceptance-java' (\e[0;36mv1.7.1\e[0m) in /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not upgrade module 'pmtacceptance-java' (v1.7.1 -> latest: v1.7.1)
STDERR> The installed version is already the latest version
STDERR> Use `puppet module install --force` to re-install this module\e[0m
OUTPUT
end
step "Upgrade a module to the latest version with --force"
on master, puppet("module upgrade pmtacceptance-java --force") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-java' ...
Found 'pmtacceptance-java' (\e[0;36mv1.7.1\e[0m) in /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-java (\e[0;36mv1.7.1 -> v1.7.1\e[0m)
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/upgrade/with_constraints_on_it.rb b/acceptance/tests/modules/upgrade/with_constraints_on_it.rb
index bb88a0b2f..2d33fd339 100644
--- a/acceptance/tests/modules/upgrade/with_constraints_on_it.rb
+++ b/acceptance/tests/modules/upgrade/with_constraints_on_it.rb
@@ -1,58 +1,58 @@
begin test_name "puppet module upgrade (with constraints on it)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, <<-'MANIFEST1'
file { '/usr/share/puppet':
ensure => directory,
}
file { ['/etc/puppet/modules', '/usr/share/puppet/modules']:
ensure => directory,
recurse => true,
purge => true,
force => true,
}
MANIFEST1
on master, puppet("module install pmtacceptance-java --version 1.7.0")
on master, puppet("module install pmtacceptance-apollo")
on master, puppet("module list") do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-apollo (\e[0;36mv0.0.1\e[0m)
├── pmtacceptance-java (\e[0;36mv1.7.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
step "Upgrade a version-constrained module that has an upgrade"
on master, puppet("module upgrade pmtacceptance-java") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-java' ...
Found 'pmtacceptance-java' (\e[0;36mv1.7.0\e[0m) in /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-java (\e[0;36mv1.7.0 -> v1.7.1\e[0m)
OUTPUT
end
step "Try to upgrade a version-constrained module that has no upgrade"
on master, puppet("module upgrade pmtacceptance-stdlib"), :acceptable_exit_codes => [0] do
assert_output <<-OUTPUT
STDOUT> Preparing to upgrade 'pmtacceptance-stdlib' ...
STDOUT> Found 'pmtacceptance-stdlib' (\e[0;36mv1.0.0\e[0m) in /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not upgrade module 'pmtacceptance-stdlib' (v1.0.0 -> best: v1.0.0)
STDERR> The installed version is already the best fit for the current dependencies
STDERR> 'pmtacceptance-apollo' (v0.0.1) requires 'pmtacceptance-stdlib' (>= 1.0.0)
STDERR> 'pmtacceptance-java' (v1.7.1) requires 'pmtacceptance-stdlib' (v1.0.0)
STDERR> Use `puppet module install --force` to re-install this module\e[0m
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/upgrade/with_constraints_on_its_dependencies.rb b/acceptance/tests/modules/upgrade/with_constraints_on_its_dependencies.rb
index 07a9a8933..d11fb3588 100644
--- a/acceptance/tests/modules/upgrade/with_constraints_on_its_dependencies.rb
+++ b/acceptance/tests/modules/upgrade/with_constraints_on_its_dependencies.rb
@@ -1,100 +1,100 @@
begin test_name "puppet module upgrade (with constraints on its dependencies)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, <<-'MANIFEST1'
file { '/usr/share/puppet':
ensure => directory,
}
file { ['/etc/puppet/modules', '/usr/share/puppet/modules']:
ensure => directory,
recurse => true,
purge => true,
force => true,
}
MANIFEST1
apply_manifest_on master, <<-PP
file {
[
'/etc/puppet/modules/unicorns',
]: ensure => directory;
'/etc/puppet/modules/unicorns/metadata.json':
content => '{
"name": "notpmtacceptance/unicorns",
"version": "0.0.3",
"source": "",
"author": "notpmtacceptance",
"license": "MIT",
"dependencies": [
{ "name": "pmtacceptance/stdlib", "version_requirement": "0.0.2" }
]
}';
}
PP
on master, puppet("module install pmtacceptance-stdlib --version 0.0.2")
on master, puppet("module install pmtacceptance-java --version 1.6.0")
on master, puppet("module list") do
assert_output <<-OUTPUT
/etc/puppet/modules
├── notpmtacceptance-unicorns (\e[0;36mv0.0.3\e[0m)
├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv0.0.2\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
step "Try to upgrade a module with constraints on its dependencies that cannot be met"
on master, puppet("module upgrade pmtacceptance-java"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to upgrade 'pmtacceptance-java' ...
STDOUT> Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) in /etc/puppet/modules ...
STDOUT> Downloading from http://forge.puppetlabs.com ...
STDERR> \e[1;31mError: Could not upgrade module 'pmtacceptance-java' (v1.6.0 -> latest: v1.7.1)
STDERR> No version of 'pmtacceptance-stdlib' will satisfy dependencies
STDERR> 'notpmtacceptance-unicorns' (v0.0.3) requires 'pmtacceptance-stdlib' (v0.0.2)
STDERR> 'pmtacceptance-java' (v1.7.1) requires 'pmtacceptance-stdlib' (v1.0.0)
STDERR> Use `puppet module upgrade --ignore-dependencies` to upgrade only this module\e[0m
OUTPUT
end
step "Relax constraints"
on master, puppet("module uninstall notpmtacceptance-unicorns")
on master, puppet("module list") do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv0.0.2\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
step "Upgrade a single module, ignoring its dependencies"
on master, puppet("module upgrade pmtacceptance-java --version 1.7.0 --ignore-dependencies") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-java' ...
Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) in /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-java (\e[0;36mv1.6.0 -> v1.7.0\e[0m)
OUTPUT
end
step "Upgrade a module with constraints on its dependencies that can be met"
on master, puppet("module upgrade pmtacceptance-java") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-java' ...
Found 'pmtacceptance-java' (\e[0;36mv1.7.0\e[0m) in /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/etc/puppet/modules
└─┬ pmtacceptance-java (\e[0;36mv1.7.0 -> v1.7.1\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv0.0.2 -> v1.0.0\e[0m)
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/upgrade/with_local_changes.rb b/acceptance/tests/modules/upgrade/with_local_changes.rb
index b782dbc9d..6d2f4a07d 100644
--- a/acceptance/tests/modules/upgrade/with_local_changes.rb
+++ b/acceptance/tests/modules/upgrade/with_local_changes.rb
@@ -1,63 +1,63 @@
begin test_name "puppet module upgrade (with local changes)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, <<-'MANIFEST1'
file { '/usr/share/puppet':
ensure => directory,
}
file { ['/etc/puppet/modules', '/usr/share/puppet/modules']:
ensure => directory,
recurse => true,
purge => true,
force => true,
}
MANIFEST1
on master, puppet("module install pmtacceptance-java --version 1.6.0")
on master, puppet("module list") do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
apply_manifest_on master, <<-PP
file {
'/etc/puppet/modules/java/README': content => "I CHANGE MY READMES";
'/etc/puppet/modules/java/NEWFILE': content => "I don't exist.'";
}
PP
step "Try to upgrade a module with local changes"
on master, puppet("module upgrade pmtacceptance-java"), :acceptable_exit_codes => [1] do
assert_output <<-OUTPUT
STDOUT> Preparing to upgrade 'pmtacceptance-java' ...
STDOUT> Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) in /etc/puppet/modules ...
STDERR> \e[1;31mError: Could not upgrade module 'pmtacceptance-java' (v1.6.0 -> latest)
STDERR> Installed module has had changes made locally
STDERR> Use `puppet module upgrade --force` to upgrade this module anyway\e[0m
OUTPUT
end
on master, '[[ "$(cat /etc/puppet/modules/java/README)" == "I CHANGE MY READMES" ]]'
on master, '[ -f /etc/puppet/modules/java/NEWFILE ]'
step "Upgrade a module with local changes with --force"
on master, puppet("module upgrade pmtacceptance-java --force") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-java' ...
Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) in /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-java (\e[0;36mv1.6.0 -> v1.7.1\e[0m)
OUTPUT
end
on master, '[[ "$(cat /etc/puppet/modules/java/README)" != "I CHANGE MY READMES" ]]'
on master, '[ ! -f /etc/puppet/modules/java/NEWFILE ]'
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/upgrade/with_scattered_dependencies.rb b/acceptance/tests/modules/upgrade/with_scattered_dependencies.rb
index c5e9f9a9e..29526fe5b 100644
--- a/acceptance/tests/modules/upgrade/with_scattered_dependencies.rb
+++ b/acceptance/tests/modules/upgrade/with_scattered_dependencies.rb
@@ -1,48 +1,48 @@
begin test_name "puppet module upgrade (with scattered dependencies)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, <<-'MANIFEST1'
file { '/usr/share/puppet':
ensure => directory,
}
file { ['/etc/puppet/modules', '/usr/share/puppet/modules']:
ensure => directory,
recurse => true,
purge => true,
force => true,
}
MANIFEST1
on master, puppet("module install pmtacceptance-stdlib --version 0.0.2 --target-dir /usr/share/puppet/modules")
on master, puppet("module install pmtacceptance-java --version 1.6.0 --target-dir /etc/puppet/modules --ignore-dependencies")
on master, puppet("module install pmtacceptance-postgresql --version 0.0.1 --target-dir /etc/puppet/modules --ignore-dependencies")
on master, puppet("module list") do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
└── pmtacceptance-postgresql (\e[0;36mv0.0.1\e[0m)
/usr/share/puppet/modules
└── pmtacceptance-stdlib (\e[0;36mv0.0.2\e[0m)
OUTPUT
end
step "Upgrade a module that has a more recent version published"
on master, puppet("module upgrade pmtacceptance-postgresql --version 0.0.2") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-postgresql' ...
Found 'pmtacceptance-postgresql' (\e[0;36mv0.0.1\e[0m) in /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/etc/puppet/modules
└─┬ pmtacceptance-postgresql (\e[0;36mv0.0.1 -> v0.0.2\e[0m)
├─┬ pmtacceptance-java (\e[0;36mv1.6.0 -> v1.7.0\e[0m)
│ └── pmtacceptance-stdlib (\e[0;36mv0.0.2 -> v1.0.0\e[0m) [/usr/share/puppet/modules]
└── pmtacceptance-stdlib (\e[0;36mv0.0.2 -> v1.0.0\e[0m) [/usr/share/puppet/modules]
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end
diff --git a/acceptance/tests/modules/upgrade/with_update_available.rb b/acceptance/tests/modules/upgrade/with_update_available.rb
index 5e61c6ec9..5a315e8c1 100644
--- a/acceptance/tests/modules/upgrade/with_update_available.rb
+++ b/acceptance/tests/modules/upgrade/with_update_available.rb
@@ -1,42 +1,42 @@
begin test_name "puppet module upgrade (with update available)"
step 'Setup'
-require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.com')
+require 'resolv'; ip = Resolv.getaddress('forge-dev.puppetlabs.lan')
apply_manifest_on master, "host { 'forge.puppetlabs.com': ip => '#{ip}' }"
apply_manifest_on master, <<-'MANIFEST1'
file { '/usr/share/puppet':
ensure => directory,
}
file { ['/etc/puppet/modules', '/usr/share/puppet/modules']:
ensure => directory,
recurse => true,
purge => true,
force => true,
}
MANIFEST1
on master, puppet("module install pmtacceptance-java --version 1.6.0")
on master, puppet("module list") do
assert_output <<-OUTPUT
/etc/puppet/modules
├── pmtacceptance-java (\e[0;36mv1.6.0\e[0m)
└── pmtacceptance-stdlib (\e[0;36mv1.0.0\e[0m)
/usr/share/puppet/modules (no modules installed)
OUTPUT
end
step "Upgrade a module that has a more recent version published"
on master, puppet("module upgrade pmtacceptance-java") do
assert_output <<-OUTPUT
Preparing to upgrade 'pmtacceptance-java' ...
Found 'pmtacceptance-java' (\e[0;36mv1.6.0\e[0m) in /etc/puppet/modules ...
Downloading from http://forge.puppetlabs.com ...
Upgrading -- do not interrupt ...
/etc/puppet/modules
└── pmtacceptance-java (\e[0;36mv1.6.0 -> v1.7.1\e[0m)
OUTPUT
end
ensure step "Teardown"
apply_manifest_on master, "host { 'forge.puppetlabs.com': ensure => absent }"
apply_manifest_on master, "file { ['/etc/puppet/modules', '/usr/share/puppet/modules']: ensure => directory, recurse => true, purge => true, force => true }"
end