summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluke <luke@1f5c1d6a-bddf-0310-8f58-fc49e503516a>2006-05-30 22:33:22 +0000
committerluke <luke@1f5c1d6a-bddf-0310-8f58-fc49e503516a>2006-05-30 22:33:22 +0000
commit3a0181ebadc8f8cfe9cac7591971cd5fde23c8e5 (patch)
treec67e1d0a19b8f66881f34f51ed22602c8d8cc549
parent6932a9582fda1e2f5999a4163ea5e692699e6754 (diff)
downloadfacter-3a0181ebadc8f8cfe9cac7591971cd5fde23c8e5.tar.gz
facter-3a0181ebadc8f8cfe9cac7591971cd5fde23c8e5.tar.xz
facter-3a0181ebadc8f8cfe9cac7591971cd5fde23c8e5.zip
fixing linux memory stuff
git-svn-id: http://reductivelabs.com/svn/facter/trunk@115 1f5c1d6a-bddf-0310-8f58-fc49e503516a
-rw-r--r--conf/redhat/facter.spec2
-rw-r--r--lib/facter/memory.rb2
-rw-r--r--tests/tc_simple.rb6
3 files changed, 8 insertions, 2 deletions
diff --git a/conf/redhat/facter.spec b/conf/redhat/facter.spec
index 9e48621..ab87cd2 100644
--- a/conf/redhat/facter.spec
+++ b/conf/redhat/facter.spec
@@ -2,7 +2,7 @@
Summary: Ruby module for collecting simple facts about a host operating system
Name: facter
-Version: 1.2.0
+Version: 1.2.1
Release: 1%{?dist}
License: GPL
Group: System Environment/Base
diff --git a/lib/facter/memory.rb b/lib/facter/memory.rb
index 2088682..47f98f7 100644
--- a/lib/facter/memory.rb
+++ b/lib/facter/memory.rb
@@ -50,7 +50,7 @@ end
:SwapSize => "SwapTotal",
:SwapFree => "SwapFree"}.each do |fact, name|
Facter.add(fact) do
- tag "kernel", "linux"
+ tag "kernel", "Linux"
setcode do
Facter::Memory.meminfo_number(name)
end
diff --git a/tests/tc_simple.rb b/tests/tc_simple.rb
index bd71c6d..2d3c5fe 100644
--- a/tests/tc_simple.rb
+++ b/tests/tc_simple.rb
@@ -435,6 +435,12 @@ some random stuff
Facter.load
end
end
+
+ if Facter.kernel == "Linux"
+ def test_memoryonlinux
+ assert(Facter.memorysize, "Did not get memory")
+ end
+ end
end
# $Id$