spec/backend/exec/build_command_spec.rb in specinfra-2.0.0.beta6 vs spec/backend/exec/build_command_spec.rb in specinfra-2.0.0.beta7

@@ -72,13 +72,18 @@
       end
     end
   end
 end
 
-describe 'check_os' do
+describe 'os' do
+  before do
+    # clear os information cache
+    property[:os_by_host] = {}
+  end
+
   context 'test ubuntu with lsb_release command' do
-    subject { backend.check_os }
+    subject { os }
     it do
       expect(backend).to receive(:run_command).at_least(1).times do |args|
         if ['ls /etc/debian_version', 'lsb_release -ir'].include? args
           double(
             :run_command_response,
@@ -86,19 +91,19 @@
             :stdout => "Distributor ID:\tUbuntu\nRelease:\t12.04\n"
           )
         elsif args == 'uname -m'
           double :run_command_response, :success? => true, :stdout => "x86_64\n"
         else
-          double :run_command_response, :success? => false
+          double :run_command_response, :success? => false, :stdout => nil
         end
       end
-      should eq({:family => 'Ubuntu', :release => '12.04', :arch => 'x86_64' })
+      should eq({:family => 'ubuntu', :release => '12.04', :arch => 'x86_64' })
     end
   end
 
   context 'test ubuntu with /etc/lsb-release' do
-    subject { backend.check_os }
+    subject { os }
     it do
       expect(backend).to receive(:run_command).at_least(1).times do |args|
         if ['ls /etc/debian_version', 'cat /etc/lsb-release'].include? args
           double(
             :run_command_response,
@@ -111,29 +116,29 @@
 EOF
           )
         elsif args == 'uname -m'
           double :run_command_response, :success? => true, :stdout => "x86_64\n"
         else
-          double :run_command_response, :success? => false
+          double :run_command_response, :success? => false, :stdout => nil
         end
       end
-      should eq({:family => 'Ubuntu', :release => '12.04', :arch => 'x86_64' })
+      should eq({:family => 'ubuntu', :release => '12.04', :arch => 'x86_64' })
     end
   end
 
   context 'test debian (no lsb_release or lsb-release)' do
-    subject { backend.check_os }
+    subject { os }
     it do
       expect(backend).to receive(:run_command).at_least(1).times do |args|
         if args == 'ls /etc/debian_version'
-          double :run_command_response, :success? => true
+          double :run_command_response, :success? => true, :stdout => nil
         elsif args == 'uname -m'
           double :run_command_response, :success? => true, :stdout => "x86_64\n"
         else
-          double :run_command_response, :success? => false
+          double :run_command_response, :success? => false, :stdout => nil
         end
       end
-      should eq({:family => 'Debian', :release => nil, :arch => 'x86_64' })
+      should eq({:family => 'debian', :release => nil, :arch => 'x86_64' })
     end
   end
 end