[Pkg-puppet-devel] [facter] 31/180: (FACT-375) Install json from system packages in acceptance tests

[Stig Sandbeck Mathisen]

This is an automated email from the git hooks/post-receive script.

ssm pushed a commit to branch master
in repository facter.

commit 8549751739efa1096311ec60f0d8fc64ae5a9d1a
Author: Adrien Thebo <git at somethingsinistral.net>
Date:   Tue Mar 18 14:42:33 2014 -0700

    (FACT-375) Install json from system packages in acceptance tests
---
 acceptance/config/packages/options.rb            | 1 +
 acceptance/setup/common/00_EnvSetup.rb           | 2 ++
 acceptance/tests/facter_json_output_validates.rb | 3 ---
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/acceptance/config/packages/options.rb b/acceptance/config/packages/options.rb
index 5b9bd67..a57af70 100644
--- a/acceptance/config/packages/options.rb
+++ b/acceptance/config/packages/options.rb
@@ -1,5 +1,6 @@
 {
   :pre_suite => [
+    'setup/common/00_EnvSetup.rb',
     'setup/packages/pre-suite/010_Install.rb',
   ],
 }
diff --git a/acceptance/setup/common/00_EnvSetup.rb b/acceptance/setup/common/00_EnvSetup.rb
index 889d6cc..f75b55d 100644
--- a/acceptance/setup/common/00_EnvSetup.rb
+++ b/acceptance/setup/common/00_EnvSetup.rb
@@ -11,10 +11,12 @@ PACKAGES = {
   :redhat => [
     'git',
     'ruby',
+    'rubygem-json',
   ],
   :debian => [
     ['git', 'git-core'],
     'ruby',
+    'libjson-ruby',
   ],
   :solaris => [
     ['git', 'developer/versioning/git'],
diff --git a/acceptance/tests/facter_json_output_validates.rb b/acceptance/tests/facter_json_output_validates.rb
index a2c320d..3a06c61 100644
--- a/acceptance/tests/facter_json_output_validates.rb
+++ b/acceptance/tests/facter_json_output_validates.rb
@@ -4,9 +4,6 @@ require 'json-schema'
 test_name "Running facter --json should validate against the schema"
 
 agents.each do |agent|
-  step "Agent #{agent}: Install json gem (needed on older platforms)"
-  on(agent, "gem install json") unless agent['platform'] =~ /windows/
-
   step "Agent #{agent}: run 'facter --json' and validate"
   on(agent, facter('--json')) do
     schema = JSON.parse(File.read("../schema/facter.json"))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-puppet/facter.git