Change resolution order of python2_version to use python first

adevore · adevore · commit fe0220381862 · 2015-08-27T04:22:02.000-07:00
diff --git a/lib/facter/python_version.rb b/lib/facter/python_version.rb
@@ -14,14 +14,12 @@ def get_python_version(executable)
 
 Facter.add("python2_version") do
   setcode do
-    python2_version = get_python_version 'python2'
-    if python2_version.nil?
-      default_version = get_python_version 'python'
-      if !default_version.nil? and default_version.start_with?('2')
-        python2_version = default_version
-      end
+    default_version = get_python_version 'python'
+    if default_version.nil? or !default_version.start_with?('2')
+      get_python_version 'python2'
+    else
+      default_version
     end
-    python2_version
   end
 end
 
diff --git a/spec/unit/facter/python_version_spec.rb b/spec/unit/facter/python_version_spec.rb
@@ -35,31 +35,32 @@
   end
 
   describe "python2_version" do
-    context 'returns Python 2 version when `python2` is present' do
+    context 'returns Python 2 version when `python` is present and Python 2' do
       it do
         Facter::Util::Resolution.stubs(:exec)
-        Facter::Util::Resolution.expects(:which).with("python2").returns(true)
-        Facter::Util::Resolution.expects(:exec).with("python2 -V 2>&1").returns(python2_version_output)
+        Facter::Util::Resolution.expects(:which).with("python").returns(true)
+        Facter::Util::Resolution.expects(:exec).with("python -V 2>&1").returns(python2_version_output)
         Facter.value(:python2_version).should == '2.7.9'
       end
     end
 
-    context 'returns Python 2 version when `python2` is absent and `python` is Python 2' do
+    context 'returns Python 2 version when `python` is Python 3 and `python2` is present' do
       it do
         Facter::Util::Resolution.stubs(:exec)
-        Facter::Util::Resolution.expects(:which).with("python2").returns(false)
         Facter::Util::Resolution.expects(:which).with("python").returns(true)
-        Facter::Util::Resolution.expects(:exec).with("python -V 2>&1").returns(python2_version_output)
+        Facter::Util::Resolution.expects(:exec).with("python -V 2>&1").returns(python3_version_output)
+        Facter::Util::Resolution.expects(:which).with("python2").returns(true)
+        Facter::Util::Resolution.expects(:exec).with("python2 -V 2>&1").returns(python2_version_output)
         Facter.value(:python2_version).should == '2.7.9'
       end
     end
     
-    context 'returns nil when `python2` is absent and `python` is Python 3' do
+    context 'returns nil when `python` is Python 3 and `python2` is absent' do
       it do
         Facter::Util::Resolution.stubs(:exec)
-        Facter::Util::Resolution.expects(:which).with("python2").returns(false)
         Facter::Util::Resolution.expects(:which).with("python").returns(true)
         Facter::Util::Resolution.expects(:exec).with("python -V 2>&1").returns(python3_version_output)
+        Facter::Util::Resolution.expects(:which).with("python2").returns(false)
         Facter.value(:python2_version).should == nil
       end
     end
