From 0c23845c48488832cf224228f93f62714ba4d4ef Mon Sep 17 00:00:00 2001
From: Nick Lewis <nick@puppetlabs.com>
Date: Tue, 31 May 2011 14:27:16 -0700
Subject: maint: Fix spelling of acceptance directory

---
 .../ticket_7039_facter_multiple_facts_one_file.rb  | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb

(limited to 'acceptance')

diff --git a/acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb b/acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb
new file mode 100644
index 0000000..fb78628
--- /dev/null
+++ b/acceptance/tests/ticket_7039_facter_multiple_facts_one_file.rb
@@ -0,0 +1,31 @@
+test_name "#7039: Facter having issue handling multiple facts in a single file"
+
+fact_file= %q{
+Facter.add(:test_fact1) do
+    setcode do
+        "test fact 1"
+    end
+end
+
+Facter.add(:test_fact2) do
+    setcode do
+        "test fact 2"
+    end
+end
+}
+
+agent1=agents.first
+step "Agent: Create fact file with multiple facts"
+create_remote_file(agent1, '/tmp/test_facts.rb', fact_file )
+
+step "Agent: Verify test_fact1 from /tmp/test_facts.rb"
+on(agent1, "export FACTERLIB=/tmp && facter --puppet test_fact1") do
+    fail_test "Fact 1 not returned by facter --puppet test_fact1" unless
+      stdout.include? 'test fact 1'
+end
+
+step "Agent: Verify test_fact2 from /tmp/test_facts.rb"
+on(agent1, "export FACTERLIB=/tmp && facter --puppet test_fact2") do
+    fail_test "Fact 1 not returned by facter --puppet test_fact2" unless
+      stdout.include? 'test fact 2'
+end
-- 
cgit 


From 9404a7a3bb8da660e26897d052cdd03c291fb0bb Mon Sep 17 00:00:00 2001
From: Nick Lewis <nick@puppetlabs.com>
Date: Tue, 31 May 2011 14:59:20 -0700
Subject: (#7670) Add an acceptance test

This test runs only on Ubuntu machines and will reproduce the problem with these steps:

  * load Facter
  * request the operatingsystem fact
  * clear Facter
  * request the operatingsystem fact and verify it is still correct

Reviewed-By: Jacob Helwig <jacob@puppetlabs.com>
---
 .../operatingsystem_detection_after_clear_on_ubuntu.rb | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 acceptance/tests/operatingsystem_detection_after_clear_on_ubuntu.rb

(limited to 'acceptance')

diff --git a/acceptance/tests/operatingsystem_detection_after_clear_on_ubuntu.rb b/acceptance/tests/operatingsystem_detection_after_clear_on_ubuntu.rb
new file mode 100644
index 0000000..3c7c4d9
--- /dev/null
+++ b/acceptance/tests/operatingsystem_detection_after_clear_on_ubuntu.rb
@@ -0,0 +1,18 @@
+test_name "#7670: Facter should properly detect operatingsystem on Ubuntu after a clear"
+
+script_contents = <<-OS_DETECT
+  require 'facter'
+  Facter['operatingsystem'].value
+  Facter.clear
+  exit Facter['operatingsystem'].value == 'Ubuntu'
+OS_DETECT
+
+script_name = "/tmp/facter_os_detection_test_#{$$}"
+
+agents.each do |agent|
+  next unless agent['platform'].include? 'ubuntu'
+
+  create_remote_file(agent, script_name, script_contents)
+
+  on(agent, "ruby #{script_name}")
+end
-- 
cgit