chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

data/spec/integration/knife/chef_repo_path_spec.rb

@@ -52,6 +52,28 @@ describe 'chef_repo_path tests' do
         file 'users/user3.json', {}
       end
 
+      it 'knife list --local -Rfp --chef-repo-path chef_repo2 / grabs chef_repo2 stuff' do
+        Chef::Config.delete(:chef_repo_path)
+        knife("list --local -Rfp --chef-repo-path #{path_to('chef_repo2')} /").should_succeed <<EOM
+/clients/
+/clients/client3.json
+/cookbooks/
+/cookbooks/cookbook3/
+/cookbooks/cookbook3/metadata.rb
+/data_bags/
+/data_bags/bag3/
+/data_bags/bag3/item3.json
+/environments/
+/environments/env3.json
+/nodes/
+/nodes/node3.json
+/roles/
+/roles/role3.json
+/users/
+/users/user3.json
+EOM
+      end
+
       context 'when all _paths are set to alternates' do
         before :each do
           %w(client cookbook data_bag environment node role user).each do |object_name|
@@ -60,6 +82,27 @@ describe 'chef_repo_path tests' do
           Chef::Config.chef_repo_path = File.join(Chef::Config.chef_repo_path, 'chef_repo2')
         end
 
+        it 'knife list --local -Rfp --chef-repo-path chef_repo2 / grabs chef_repo2 stuff' do
+          knife("list --local -Rfp --chef-repo-path #{path_to('chef_repo2')} /").should_succeed <<EOM
+/clients/
+/clients/client3.json
+/cookbooks/
+/cookbooks/cookbook3/
+/cookbooks/cookbook3/metadata.rb
+/data_bags/
+/data_bags/bag3/
+/data_bags/bag3/item3.json
+/environments/
+/environments/env3.json
+/nodes/
+/nodes/node3.json
+/roles/
+/roles/role3.json
+/users/
+/users/user3.json
+EOM
+        end        
+
         context 'when cwd is at the top level' do
           cwd '.'
           it 'knife list --local -Rfp fails' do
@@ -171,7 +214,7 @@ EOM
       context 'when only chef_repo_path is set to its alternate' do
         before :each do
           %w(client cookbook data_bag environment node role user).each do |object_name|
-            Chef::Config["#{object_name}_path".to_sym] = nil
+            Chef::Config.delete("#{object_name}_path".to_sym)
           end
           Chef::Config.chef_repo_path = File.join(Chef::Config.chef_repo_path, 'chef_repo2')
         end
@@ -439,7 +482,7 @@ EOM
       context 'when when chef_repo_path is set to both places and no other _path is set' do
         before :each do
           %w(client cookbook data_bag environment node role user).each do |object_name|
-            Chef::Config["#{object_name}_path".to_sym] = nil
+            Chef::Config.delete("#{object_name}_path".to_sym)
           end
           Chef::Config.chef_repo_path = [
             Chef::Config.chef_repo_path,
@@ -541,10 +584,10 @@ EOM
       context 'when cookbook_path is set and nothing else' do
         before :each do
           %w(client data_bag environment node role user).each do |object_name|
-            Chef::Config["#{object_name}_path".to_sym] = nil
+            Chef::Config.delete("#{object_name}_path".to_sym)
           end
-          Chef::Config.cookbook_path = File.join(Chef::Config.chef_repo_path, 'chef_repo2', 'cookbooks')
-          Chef::Config.chef_repo_path = nil
+          Chef::Config.delete(:chef_repo_path)
+          Chef::Config.cookbook_path = File.join(@repository_dir, 'chef_repo2', 'cookbooks')
         end
 
         context 'when cwd is at the top level' do
@@ -599,13 +642,13 @@ EOM
       context 'when cookbook_path is set to multiple places and nothing else is set' do
         before :each do
           %w(client data_bag environment node role user).each do |object_name|
-            Chef::Config["#{object_name}_path".to_sym] = nil
+            Chef::Config.delete("#{object_name}_path".to_sym)
           end
+          Chef::Config.delete(:chef_repo_path)
           Chef::Config.cookbook_path = [
-            File.join(Chef::Config.chef_repo_path, 'cookbooks'),
-            File.join(Chef::Config.chef_repo_path, 'chef_repo2', 'cookbooks')
+            File.join(@repository_dir, 'cookbooks'),
+            File.join(@repository_dir, 'chef_repo2', 'cookbooks')
           ]
-          Chef::Config.chef_repo_path = nil
         end
 
         context 'when cwd is at the top level' do
@@ -702,7 +745,7 @@ EOM
       context 'when data_bag_path and chef_repo_path are set, and nothing else' do
         before :each do
           %w(client cookbook  environment node role user).each do |object_name|
-            Chef::Config["#{object_name}_path".to_sym] = nil
+            Chef::Config.delete("#{object_name}_path".to_sym)
           end
           Chef::Config.data_bag_path = File.join(Chef::Config.chef_repo_path, 'data_bags')
           Chef::Config.chef_repo_path = File.join(Chef::Config.chef_repo_path, 'chef_repo2')
@@ -760,24 +803,34 @@ EOM
       context 'when data_bag_path is set and nothing else' do
         before :each do
           %w(client cookbook  environment node role user).each do |object_name|
-            Chef::Config["#{object_name}_path".to_sym] = nil
+            Chef::Config.delete("#{object_name}_path".to_sym)
           end
-          Chef::Config.data_bag_path = File.join(Chef::Config.chef_repo_path, 'data_bags')
-          Chef::Config.chef_repo_path = nil
+          Chef::Config.delete(:chef_repo_path)
+          Chef::Config.data_bag_path = File.join(@repository_dir, 'data_bags')
         end
 
-        it 'knife list --local -Rfp / fails' do
-          knife('list --local -Rfp /').should_fail("ERROR: Must specify either chef_repo_path or cookbook_path in Chef config file\n")
+        it 'knife list --local -Rfp / lists data bags' do
+          knife('list --local -Rfp /').should_succeed <<EOM
+/data_bags/
+/data_bags/bag/
+/data_bags/bag/item.json
+EOM
         end
 
-        it 'knife list --local -Rfp /data_bags fails' do
-          knife('list --local -Rfp /data_bags').should_fail("ERROR: Must specify either chef_repo_path or cookbook_path in Chef config file\n")
+        it 'knife list --local -Rfp /data_bags lists data bags' do
+          knife('list --local -Rfp /data_bags').should_succeed <<EOM
+/data_bags/bag/
+/data_bags/bag/item.json
+EOM
         end
 
         context 'when cwd is inside the data_bags directory' do
           cwd 'data_bags'
-          it 'knife list --local -Rfp fails' do
-            knife('list --local -Rfp').should_fail("ERROR: Must specify either chef_repo_path or cookbook_path in Chef config file\n")
+          it 'knife list --local -Rfp lists data bags' do
+            knife('list --local -Rfp').should_succeed <<EOM
+bag/
+bag/item.json
+EOM
           end
         end
       end

data/spec/integration/knife/common_options_spec.rb

@@ -0,0 +1,103 @@
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require 'support/shared/integration/integration_helper'
+require 'chef/knife/raw'
+
+describe 'knife common options' do
+  extend IntegrationSupport
+  include KnifeSupport
+
+  when_the_repository "has a node" do
+    file 'nodes/x.json', {}
+
+    before(:each) do
+      if ChefZero::RSpec.server
+        ChefZero::RSpec.server.stop
+        ChefZero::RSpec.server = nil
+      end
+    end
+
+    context 'When chef_zero.enabled is true' do
+      before(:each) do
+        Chef::Config.chef_zero.enabled = true
+      end
+
+      it 'knife raw /nodes/x should retrieve the role' do
+        knife('raw /nodes/x').should_succeed /"name": "x"/
+      end
+
+      context 'And chef_zero.port is 9999' do
+        before(:each) { Chef::Config.chef_zero.port = 9999 }
+ 
+        it 'knife raw /nodes/x should retrieve the role' do
+          knife('raw /nodes/x').should_succeed /"name": "x"/
+          Chef::Config.chef_server_url.should == 'http://127.0.0.1:9999'
+        end
+      end
+
+      context 'and there is a private key' do
+        file 'mykey.pem', <<EOM
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEApubutqtYYQ5UiA9QhWP7UvSmsfHsAoPKEVVPdVW/e8Svwpyf
+0Xef6OFWVmBE+W442ZjLOe2y6p2nSnaq4y7dg99NFz6X+16mcKiCbj0RCiGqCvCk
+NftHhTgO9/RFvCbmKZ1RKNob1YzLrFpxBHaSh9po+DGWhApcd+I+op+ZzvDgXhNn
+0nauZu3rZmApI/r7EEAOjFedAXs7VPNXhhtZAiLSAVIrwU3ZajtSzgXOxbNzgj5O
+AAAMmThK+71qPdffAdO4J198H6/MY04qgtFo7vumzCq0UCaGZfmeI1UNE4+xQWwP
+HJ3pDAP61C6Ebx2snI2kAd9QMx9Y78nIedRHPwIDAQABAoIBAHssRtPM1GacWsom
+8zfeN6ZbI4KDlbetZz0vhnqDk9NVrpijWlcOP5dwZXVNitnB/HaqCqFvyPDY9JNB
+zI/pEFW4QH59FVDP42mVEt0keCTP/1wfiDDGh1vLqVBYl/ZphscDcNgDTzNkuxMx
+k+LFVxKnn3w7rGc59lALSkpeGvbbIDjp3LUMlUeCF8CIFyYZh9ZvXe4OCxYdyjxb
+i8tnMLKvJ4Psbh5jMapsu3rHQkfPdqzztQUz8vs0NYwP5vWge46FUyk+WNm/IhbJ
+G3YM22nwUS8Eu2bmTtADSJolATbCSkOwQ1D+Fybz/4obfYeGaCdOqB05ttubhenV
+ShsAb7ECgYEA20ecRVxw2S7qA7sqJ4NuYOg9TpfGooptYNA1IP971eB6SaGAelEL
+awYkGNuu2URmm5ElZpwJFFTDLGA7t2zB2xI1FeySPPIVPvJGSiZoFQOVlIg9WQzK
+7jTtFQ/tOMrF+bigEUJh5bP1/7HzqSpuOsPjEUb2aoCTp+tpiRGL7TUCgYEAwtns
+g3ysrSEcTzpSv7fQRJRk1lkBhatgNd0oc+ikzf74DaVLhBg1jvSThDhiDCdB59mr
+Jh41cnR1XqE8jmdQbCDRiFrI1Pq6TPaDZFcovDVE1gue9x86v3FOH2ukPG4d2/Xy
+HevXjThtpMMsWFi0JYXuzXuV5HOvLZiP8sN3lSMCgYANpdxdGM7RRbE9ADY0dWK2
+V14ReTLcxP7fyrWz0xLzEeCqmomzkz3BsIUoouu0DCTSw+rvAwExqcDoDylIVlWO
+fAifz7SeZHbcDxo+3TsXK7zwnLYsx7YNs2+aIv6hzUUbMNmNmXMcZ+IEwx+mRMTN
+lYmZdrA5mr0V83oDFPt/jQKBgC74RVE03pMlZiObFZNtheDiPKSG9Bz6wMh7NWMr
+c37MtZLkg52mEFMTlfPLe6ceV37CM8WOhqe+dwSGrYhOU06dYqUR7VOZ1Qr0aZvo
+fsNPu/Y0+u7rMkgv0fs1AXQnvz7kvKaF0YITVirfeXMafuKEtJoH7owRbur42cpV
+YCAtAoGAP1rHOc+w0RUcBK3sY7aErrih0OPh9U5bvJsrw1C0FIZhCEoDVA+fNIQL
+syHLXYFNy0OxMtH/bBAXBGNHd9gf5uOnqh0pYcbe/uRAxumC7Rl0cL509eURiA2T
++vFmf54y9YdnLXaqv+FhJT6B6V7WX7IpU9BMqJY1cJYXHuHG2KA=
+-----END RSA PRIVATE KEY-----
+EOM
+
+        it 'knife raw /nodes/x should retrieve the role' do
+          knife('raw /nodes/x').should_succeed /"name": "x"/
+        end
+      end
+    end
+
+    it 'knife raw -z /nodes/x retrieves the role' do
+      knife('raw -z /nodes/x').should_succeed /"name": "x"/
+    end
+
+    it 'knife raw --local-mode /nodes/x retrieves the role' do
+      knife('raw --local-mode /nodes/x').should_succeed /"name": "x"/
+    end
+
+    it 'knife raw -z --chef-zero-port=9999 /nodes/x retrieves the role' do
+      knife('raw -z --chef-zero-port=9999 /nodes/x').should_succeed /"name": "x"/
+      Chef::Config.chef_server_url.should == 'http://127.0.0.1:9999'
+    end
+  end
+end

data/spec/integration/knife/download_spec.rb

@@ -256,6 +256,15 @@ Created /data_bags/x/y.json
 EOM
           knife('diff --name-status /data_bags').should_succeed <<EOM
 D\t/data_bags/x/z.json
+EOM
+        end
+
+        it 'knife download /data_bags/x /data_bags/x/y.json downloads x once' do
+          knife('download /data_bags/x /data_bags/x/y.json').should_succeed <<EOM
+Created /data_bags
+Created /data_bags/x
+Created /data_bags/x/y.json
+Created /data_bags/x/z.json
 EOM
         end
       end
@@ -583,7 +592,7 @@ EOM
 
         context 'except the role file is textually different, but not ACTUALLY different' do
           file 'roles/x.json', <<EOM
-{  
+{
   "chef_type": "role" ,
   "default_attributes": {
   },
@@ -595,7 +604,7 @@ EOM
   "override_attributes": {
   },
   "run_list": [
-     
+
   ]
 }
 EOM
@@ -959,4 +968,31 @@ EOM
       end
     end
   end # with versioned cookbooks
+
+  when_the_chef_server 'has a cookbook' do
+    cookbook 'x', '1.0.0', { 'metadata.rb' => 'version "1.0.0"' }
+
+    when_the_repository 'is empty' do
+      it 'knife download /cookbooks/x signs all requests' do
+
+        # Check that BasicClient.request() always gets called with X-OPS-USERID
+        original_new = Chef::HTTP::BasicClient.method(:new)
+        Chef::HTTP::BasicClient.should_receive(:new) do |args|
+          new_result = original_new.call(*args)
+          original_request = new_result.method(:request)
+          new_result.should_receive(:request) do |method, url, body, headers, &response_handler|
+            headers['X-OPS-USERID'].should_not be_nil
+            original_request.call(method, url, body, headers, &response_handler)
+          end.at_least(:once)
+          new_result
+        end.at_least(:once)
+
+        knife('download /cookbooks/x').should_succeed <<EOM
+Created /cookbooks
+Created /cookbooks/x
+Created /cookbooks/x/metadata.rb
+EOM
+      end
+    end
+  end
 end

data/spec/integration/knife/raw_spec.rb

@@ -159,6 +159,69 @@ EOM
   "name": "y",
   "description": "eek"
 }
+EOM
+      end
+    end
+
+    context 'When a server returns raw json' do
+      before :each do
+        @real_chef_server_url = Chef::Config.chef_server_url
+        Chef::Config.chef_server_url = "http://127.0.0.1:9018"
+        app = lambda do |env|
+          [200, {'Content-Type' => 'application/json' }, ['{ "x": "y", "a": "b" }'] ]
+        end
+        @raw_server = Puma::Server.new(app, Puma::Events.new(STDERR, STDOUT))
+        @raw_server.add_tcp_listener("127.0.0.1", 9018)
+        @raw_server.run
+      end
+
+      after :each do
+        Chef::Config.chef_server_url = @real_chef_server_url
+        @raw_server.stop(true)
+      end
+
+      it 'knife raw /blah returns the prettified json', :pending => (RUBY_VERSION < "1.9") do
+        knife('raw /blah').should_succeed <<EOM
+{
+  "x": "y",
+  "a": "b"
+}
+EOM
+      end
+
+      it 'knife raw --no-pretty /blah returns the raw json' do
+        knife('raw --no-pretty /blah').should_succeed <<EOM
+{ "x": "y", "a": "b" }
+EOM
+      end
+    end
+
+    context 'When a server returns text' do
+      before :each do
+        @real_chef_server_url = Chef::Config.chef_server_url
+        Chef::Config.chef_server_url = "http://127.0.0.1:9018"
+        app = lambda do |env|
+          [200, {'Content-Type' => 'text' }, ['{ "x": "y", "a": "b" }'] ]
+        end
+        @raw_server = Puma::Server.new(app, Puma::Events.new(STDERR, STDOUT))
+        @raw_server.add_tcp_listener("127.0.0.1", 9018)
+        @raw_server.run
+      end
+
+      after :each do
+        Chef::Config.chef_server_url = @real_chef_server_url
+        @raw_server.stop(true)
+      end
+
+      it 'knife raw /blah returns the raw text' do
+        knife('raw /blah').should_succeed(<<EOM, :stderr => "WARN: Expected JSON response, but got content-type 'text'\n")
+{ "x": "y", "a": "b" }
+EOM
+      end
+
+      it 'knife raw --no-pretty /blah returns the raw text' do
+        knife('raw --no-pretty /blah').should_succeed(<<EOM, :stderr => "WARN: Expected JSON response, but got content-type 'text'\n")
+{ "x": "y", "a": "b" }
 EOM
       end
     end

data/spec/integration/knife/upload_spec.rb

@@ -58,10 +58,10 @@ D\t/roles/x.json
 D\t/users/admin.json
 D\t/users/x.json
 EOM
-      end
+        end
 
-      it 'knife upload --purge deletes everything' do
-        knife('upload --purge /').should_succeed(<<EOM, :stderr => "WARNING: /environments/_default.json cannot be deleted (default environment cannot be modified).\n")
+        it 'knife upload --purge deletes everything' do
+          knife('upload --purge /').should_succeed(<<EOM, :stderr => "WARNING: /environments/_default.json cannot be deleted (default environment cannot be modified).\n")
 Deleted extra entry /clients/chef-validator.json (purge is on)
 Deleted extra entry /clients/chef-webui.json (purge is on)
 Deleted extra entry /clients/x.json (purge is on)
@@ -76,7 +76,7 @@ EOM
         knife('diff --name-status /').should_succeed <<EOM
 D\t/environments/_default.json
 EOM
-      end
+        end
       end
 
       when_the_repository 'has an identical copy of each thing' do
@@ -239,6 +239,13 @@ EOM
 EOM
           JSON.parse(knife('raw /data/x/y').stdout, :create_additions => false).keys.sort.should == [ 'foo', 'id' ]
         end
+
+        it 'knife upload /data_bags/x /data_bags/x/y.json uploads x once' do
+          knife('upload /data_bags/x /data_bags/x/y.json').should_succeed <<EOM
+Created /data_bags/x
+Created /data_bags/x/y.json
+EOM
+        end
       end
 
       when_the_repository 'has a data bag item with keys chef_type and data_bag' do
@@ -1057,4 +1064,13 @@ EOM
     end
   end # with versioned cookbooks
 
+  when_the_chef_server 'has a user' do
+    user 'x', {}
+    when_the_repository 'has the same user with json_class in it' do
+      file 'users/x.json', { 'admin' => true, 'json_class' => 'Chef::WebUIUser' }
+      it 'knife upload /users/x.json succeeds' do
+        knife('upload /users/x.json').should_succeed "Updated /users/x.json\n"
+      end
+    end
+  end
 end

data/spec/integration/solo/solo_spec.rb

@@ -1,41 +1,94 @@
 require 'support/shared/integration/integration_helper'
 require 'chef/mixin/shell_out'
+require 'chef/run_lock'
+require 'chef/config'
+require 'timeout'
+require 'fileutils'
 
 describe "chef-solo" do
   extend IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  context "with a no-op recipe in the run_list" do
+  when_the_repository "has a cookbook with a no-op recipe" do
+    file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
+    file 'cookbooks/x/recipes/default.rb', ''
 
-    when_the_repository "has a cookbook with a no-op recipe" do
-      directory 'cookbooks'
-      directory 'cookbooks/x'
-      directory 'cookbooks/x/recipes'
-      file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
-      file 'cookbooks/x/recipes/default.rb', ''
+    it "should complete with success" do
+      file 'config/solo.rb', <<EOM
+cookbook_path "#{path_to('cookbooks')}"
+file_cache_path "#{path_to('config/cache')}"
+EOM
+      chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..")
+      result = shell_out("ruby bin/chef-solo -c \"#{path_to('config/solo.rb')}\" -o 'x::default' -l debug", :cwd => chef_dir)
+      result.error!
+    end
+  end
 
-      before do
-        @chef_file_cache = Dir.mktmpdir('file_cache')
-      end
+  when_the_repository "has a cookbook with a recipe with sleep" do
+    directory 'logs'
+    file 'logs/runs.log', ''
+    file 'cookbooks/x/metadata.rb', 'version "1.0.0"'
+    file 'cookbooks/x/recipes/default.rb', <<EOM
+ruby_block "sleeping" do
+  block do
+    sleep 5
+  end
+end
+EOM
+    # Ruby 1.8.7 doesn't have Process.spawn :(
+    it "while running solo concurrently", :ruby_gte_19_only => true do
+      file 'config/solo.rb', <<EOM
+cookbook_path "#{path_to('cookbooks')}"
+file_cache_path "#{path_to('config/cache')}"
+EOM
+      # We have a timeout protection here so that if due to some bug
+      # run_lock gets stuck we can discover it.
+      lambda {
+        Timeout.timeout(120) do
+          chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..")
 
-      after do
-        FileUtils.rm_rf(@chef_file_cache) if @chef_file_cache
-      end
+          # Instantiate the first chef-solo run
+          s1 = Process.spawn("ruby bin/chef-solo -c \"#{path_to('config/solo.rb')}\" -o 'x::default' \
+-l debug -L #{path_to('logs/runs.log')}", :chdir => chef_dir)
 
-      it "should complete with success" do
-        # prepare the solo config
-        directory 'config'
-        file 'config/solo.rb', <<EOM
-cookbook_path "#{File.join(@repository_dir, 'cookbooks')}"
-file_cache_path "#{@chef_file_cache}"
-EOM
-        config_file = canonicalize_path(File.join(@repository_dir, 'config', 'solo.rb'))
+          # Give it some time to progress
+          sleep 1
 
-        chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-        result = shell_out("chef-solo -c \"#{config_file}\" -o 'x::default' -l debug", :cwd => chef_dir)
-        result.error!
-      end
+          # Instantiate the second chef-solo run
+          s2 = Process.spawn("ruby bin/chef-solo -c \"#{path_to('config/solo.rb')}\" -o 'x::default' \
+-l debug -L #{path_to('logs/runs.log')}", :chdir => chef_dir)
+
+          Process.waitpid(s1)
+          Process.waitpid(s2)
+        end
+      }.should_not raise_error(Timeout::Error)
+
+      # Unfortunately file / directory helpers in integration tests
+      # are implemented using before(:each) so we need to do all below
+      # checks in one example.
+      run_log = File.read(path_to('logs/runs.log'))
 
+      # both of the runs should succeed
+      run_log.lines.reject {|l| !l.include? "INFO: Chef Run complete in"}.length.should == 2
+
+      # second run should have a message which indicates it's waiting for the first run
+      pid_lines = run_log.lines.reject {|l| !l.include? "Chef-client pid:"}
+      pid_lines.length.should == 2
+      pids = pid_lines.map {|l| l.split(" ").last}
+      run_log.should include("Chef client #{pids[0]} is running, will wait for it to finish and then run.")
+
+      # second run should start after first run ends
+      starts = [ ]
+      ends = [ ]
+      run_log.lines.each_with_index do |line, index|
+        if line.include? "Chef-client pid:"
+          starts << index
+        elsif line.include? "INFO: Chef Run complete in"
+          ends << index
+        end
+      end
+      starts[1].should > ends[0]
     end
+
   end
 end