Merge pull request #4163 from segatspiretech/master

(PUP-5002) acceptance: add metadata.json data binding to lookup.rb test
puppetlabs · Aug 18, 2015 · e504d8e · e504d8e
2 parents 041560a + 9870173
commit e504d8e
Showing 1 changed file with 65 additions and 3 deletions.
diff --git a/acceptance/tests/parser_functions/lookup.rb b/acceptance/tests/parser_functions/lookup.rb
@@ -44,7 +44,6 @@
 hiera_array_value0              = "hiera_array_a"
 hiera_array_value1              = "hiera_array_b"
 
-
 def mod_manifest_entry(module_name = nil, testdir, module_data_implied_key,
                        module_data_implied_value, module_data_key,
                        module_data_value, hash_name, module_hash_key,
@@ -90,6 +89,36 @@ def data()
   end
 end
 
+def mod_manifest_metadata_json(module_name = nil, testdir)
+  if module_name
+    metadata_manifest = <<PPmetadata
+      file { '#{testdir}/environments/production/modules/#{module_name}/metadata.json':
+        ensure => file,
+        content => '
+{
+  "name": "tester-#{module_name}",
+  "version": "0.1.0",
+  "author": "tester",
+  "summary": null,
+  "license": "Apache-2.0",
+  "source": "",
+  "project_page": null,
+  "issues_url": null,
+  "dependencies": [
+  ],
+  "data_provider": "function"
+}
+        ',
+        mode => "0644",
+      }
+      file { '#{testdir}/environments/production/modules/#{module_name}/lib/puppet/bindings':
+        ensure => absent,
+	force  => true,
+      }
+PPmetadata
+  end
+end
+
 module_manifest1 = mod_manifest_entry(module_name, testdir, module_data_implied_key,
                        module_data_implied_value, module_data_key, module_data_value,
                        hash_name, module_hash_key, module_hash_value, array_key,
@@ -98,6 +127,8 @@ def data()
                        module_data_implied_value, module_data_key, module_data_value_other,
                        hash_name, module_hash_key, module_hash_value, array_key,
                        module_array_value0, module_array_value1)
+metadata_manifest1 = mod_manifest_metadata_json(module_name, testdir)
+metadata_manifest2 = mod_manifest_metadata_json(module_name2, testdir)
 
 apply_manifest_on(master, <<-PP, :catch_failures => true)
 File {
@@ -255,17 +286,18 @@ class #{module_name}($#{env_data_implied_key},
 }
 PP
 
-step "Try to lookup string data"
 
 master_opts = {
   'main' => {
     'environmentpath' => "#{testdir}/environments",
     'hiera_config' => "#{testdir}/hiera.yaml",
   },
 }
-
 with_puppet_running_on master, master_opts, testdir do
   agents.each do |agent|
+
+    step "Try to lookup string data, binding specified in bindings/default.rb"
+
     on(agent, puppet('agent', "-t --server #{master}"), :acceptable_exit_codes => [2])
     assert_match("#{env_data_implied_key} #{env_data_implied_value}", stdout)
     assert_match("#{env_data_key} #{env_data_value}", stdout)
@@ -285,4 +317,34 @@ class #{module_name}($#{env_data_implied_key},
 
     assert_match("#{array_key} [#{hiera_array_value0}, #{hiera_array_value1}, #{env_array_value0}, #{env_array_value1}, #{module_array_value0}, #{module_array_value1}]", stdout)
   end
+
+  apply_manifest_on(master, <<-PP, :catch_failures => true)
+  #{metadata_manifest1}
+  #{metadata_manifest2}
+  PP
+
+
+  step "Try again to lookup string data, binding specified in metadata.json"
+
+  agents.each do |agent|
+    on(agent, puppet('agent', "-t --server #{master}"), :acceptable_exit_codes => [0, 2])
+    assert_match("#{env_data_implied_key} #{env_data_implied_value}", stdout)
+    assert_match("#{env_data_key} #{env_data_value}", stdout)
+
+    assert_match("#{module_data_implied_key} #{module_data_implied_value}", stdout)
+    assert_match("#{module_data_key} #{module_data_value}", stdout)
+
+    assert_match("#{module_data_key} #{module_data_value_other}", stdout)
+
+    assert_match("#{env_data_override_implied_key} #{env_data_override_implied_value}", stdout)
+    assert_match("#{env_data_override_key} #{env_data_override_value}", stdout)
+
+    assert_match("#{hiera_data_implied_key} #{hiera_data_implied_value}", stdout)
+    assert_match("#{hiera_data_key} #{hiera_data_value}", stdout)
+
+    assert_match("#{hash_name} {#{module_hash_key} => #{module_hash_value}, #{env_hash_key} => #{env_hash_value}, #{hiera_hash_key} => #{hiera_hash_value}}", stdout)
+
+    assert_match("#{array_key} [#{hiera_array_value0}, #{hiera_array_value1}, #{env_array_value0}, #{env_array_value1}, #{module_array_value0}, #{module_array_value1}]", stdout)
+
+  end
 end