Merge pull request #2504 from pvande/feature/master/pup2093_migrate_pmt_to_v3_api

Migrate PMT to the /v3 API.

Author: pvande

acceptance/tests/modules/backwards_compatibility/13682_do_not_monkey_patch_old_pmt.rb

@@ -10,7 +10,6 @@ module Tool
     end
   end
 end
-require "rubygems"
 require "puppet"
 puts Puppet.version
 '

acceptance/tests/modules/build/build_basic.rb

@@ -17,7 +17,7 @@
 summary "Nginx Module"
 description "Nginx"
 project_page "http://github.com/puppetlabs/puppetlabs-ntp"
-dependency "puppetlabs/stdlib", ">= 1.0.0"
+dependency "puppetlabs/stdlub", ">= 1.0.0"
 ';
 }
 PP

acceptance/tests/modules/install/already_installed.rb

@@ -26,8 +26,8 @@
 end
 
 step "Try to install a module that is already installed" do
-  on master, puppet("module install #{module_reference}"), :acceptable_exit_codes => [1] do
-    assert_match(/#{module_reference}.*is already installed/, stderr,
+  on master, puppet("module install #{module_reference}"), :acceptable_exit_codes => [0] do
+    assert_match(/#{module_reference}.*is already installed/, stdout,
           "Error that module was already installed was not displayed")
   end
   assert_module_installed_on_disk(master, master['distmoduledir'], module_name)

acceptance/tests/modules/install/already_installed_elsewhere.rb

@@ -4,6 +4,7 @@
 
 module_author = "pmtacceptance"
 module_name   = "nginx"
+module_reference = "#{module_author}-#{module_name}"
 module_dependencies = []
 
 orig_installed_modules = get_installed_modules_for_hosts hosts
@@ -35,8 +36,8 @@
 PP
 
 step "Try to install a module that is already installed"
-on master, puppet("module install #{module_author}-#{module_name}"), :acceptable_exit_codes => [1] do
-  assert_match(/#{module_author}-#{module_name}.*is already installed/, stderr,
+on master, puppet("module install #{module_author}-#{module_name}"), :acceptable_exit_codes => [0] do
+  assert_match(/#{module_reference}.*is already installed/, stdout,
         "Error that module was already installed was not displayed")
 end
 assert_module_not_installed_on_disk(master, master['distmoduledir'], module_name)
@@ -50,6 +51,12 @@
 end
 assert_module_not_installed_on_disk(master, master['distmoduledir'], module_name)
 
+step "Install a specifc module version that is already installed (with --force)"
+on master, puppet("module install #{module_author}-#{module_name} --force --version 0.0.1") do
+  assert_module_installed_ui(stdout, module_author, module_name, '0.0.1', '==')
+end
+assert_module_installed_on_disk(master, master['distmoduledir'], module_name)
+
 step "Install a module that is already installed (with --force)"
 on master, puppet("module install #{module_author}-#{module_name} --force") do
   assert_module_installed_ui(stdout, module_author, module_name)

acceptance/tests/modules/install/already_installed_with_local_changes.rb

@@ -30,16 +30,6 @@
   on master, "echo 'changed' >> #{module_path}/README"
 end
 
-step "Try to install a module that is already installed" do
-  on master, puppet("module install #{module_reference}"), :acceptable_exit_codes => [1] do
-    assert_match(/#{module_reference}.*is already installed/, stderr,
-          "Error that module was already installed was not displayed")
-    assert_match(/changes made locally/, stderr,
-          "Error that module has local changes was not displayed")
-  end
-  assert_module_installed_on_disk(master, master['distmoduledir'], module_name)
-end
-
 step "Try to install a specific version of a module that is already installed" do
   on master, puppet("module install #{module_reference} --version 1.x"), :acceptable_exit_codes => [1] do
     assert_match(/Could not install module '#{module_reference}' \(v1.x\)/, stderr,

acceptance/tests/modules/install/force_ignores_dependencies.rb

@@ -3,7 +3,7 @@
 extend Puppet::Acceptance::ModuleUtils
 
 module_author = "pmtacceptance"
-module_name   = "php"
+module_name   = "git"
 module_dependencies   = ["apache"]
 
 orig_installed_modules = get_installed_modules_for_hosts hosts
@@ -17,8 +17,8 @@
 
 step "Try to install an unsatisfiable module"
 on master, puppet("module install #{module_author}-#{module_name}"), :acceptable_exit_codes => [1] do
-  assert_match(/No version of '#{module_author}-#{module_name}' will satisfy dependencies/, stderr,
-        "Error that module dependencies could not be met was not displayed")
+  assert_match(/No version of '#{module_author}-#{module_name}' can satisfy all dependencies/, stderr,
+    "Error that module dependencies could not be met was not displayed")
 end
 assert_module_not_installed_on_disk(master, master['distmoduledir'], module_name)
 module_dependencies.each do |dependency|

acceptance/tests/modules/install/ignoring_dependencies.rb

@@ -4,7 +4,7 @@
 
 module_author = "pmtacceptance"
 module_name   = "java"
-module_dependencies   = ["stdlib"]
+module_dependencies   = ["stdlub"]
 
 orig_installed_modules = get_installed_modules_for_hosts hosts
 teardown do

acceptance/tests/modules/install/nonexistent_module.rb

@@ -17,8 +17,11 @@
 
 step "Try to install a non-existent module"
 on master, puppet("module install #{module_author}-#{module_name}"), :acceptable_exit_codes => [1] do
-  assert_match(/#{module_author}\/#{module_name} not found/, stderr,
-        "Error that module was not found was not displayed")
+  assert_match(/could not install '#{module_author}-#{module_name}'/i, stderr,
+      "Error that module could not be installed was not displayed")
+
+  assert_match(/no releases are available from/i, stderr,
+      "Error that no releases were found was not displayed")
 end
 
 step "Try to install a non-existent module (JSON rendering)"
@@ -27,21 +30,13 @@
   str  = stdout.lines.to_a.last
   json = JSON.parse(str)
 
-  oneline_expectation   = %[Could not execute operation for '#{module_author}/#{module_name}'. Detail: Module #{module_author}/#{module_name} not found / 410 Gone.]
-  multiline_expectation = <<-OUTPUT.chomp
-Could not execute operation for '#{module_author}/#{module_name}'
-  The server being queried was https://forge.puppetlabs.com
-  The HTTP response we received was '410 Gone'
-  The message we received said 'Module #{module_author}/#{module_name} not found'
-    Check the author and module names are correct.
-OUTPUT
-
+  oneline_expectation   = /could not install '#{module_author}-#{module_name}'; no releases are available from/i
+  multiline_expectation = /could not install '#{module_author}-#{module_name}'.*no releases are available from.*have at least one published release.*\z/im
 
-  assert_equal nil,                         json['module_version']
+  assert_equal 'failure', json['result']
   assert_equal "#{module_author}-#{module_name}", json['module_name']
-  assert_equal 'failure',                   json['result']
-  assert_equal master['distmoduledir'],     json['install_dir']
-  assert_equal multiline_expectation,       json['error']['multiline']
-  assert_equal oneline_expectation,         json['error']['oneline']
+  assert_equal '>= 0.0.0', json['module_version']
+  assert_equal master['distmoduledir'], json['install_dir']
+  assert_match oneline_expectation, json['error']['oneline']
+  assert_match multiline_expectation, json['error']['multiline']
 end
-

acceptance/tests/modules/install/with_cycles.rb

@@ -20,7 +20,7 @@
 on master, puppet("module install #{module_author}-#{module_name} --version 0.0.1") do
   assert_equal <<-OUTPUT, stdout
 \e[mNotice: Preparing to install into #{master['distmoduledir']} ...\e[0m
-\e[mNotice: Downloading from https://forge.puppetlabs.com ...\e[0m
+\e[mNotice: Downloading from https://forgeapi.puppetlabs.com ...\e[0m
 \e[mNotice: Installing -- do not interrupt ...\e[0m
 #{master['distmoduledir']}
 └─┬ #{module_author}-#{module_name} (\e[0;36mv0.0.1\e[0m)

acceptance/tests/modules/install/with_dependencies.rb

@@ -4,7 +4,7 @@
 
 module_author = "pmtacceptance"
 module_name   = "java"
-module_dependencies   = ["stdlib"]
+module_dependencies   = ["stdlub"]
 
 orig_installed_modules = get_installed_modules_for_hosts hosts
 teardown do