fixed spec due to merge

Gemfile

@@ -5,7 +5,7 @@ gem "rubyforge",             "1.0.4"
 gem "rake",                  "0.8.7"
 gem 'right_support',         "~> 0.9"
 gem 'right_agent',:git => 'git@github.com:rightscale/right_agent.git',
-                  :branch => 'azure_28_edit_recipe_on_instance',
+                  :branch => 'master',
                   :require => ['right_agent', 'right_agent/core_payload_types']
 
 # Dependencies for right_scraper

Gemfile.lock

@@ -12,8 +12,8 @@ GIT
 
 GIT
   remote: git@github.com:rightscale/right_agent.git
-  revision: ce13d241fbebadd417d5df8b81858ceb04a99839
-  branch: azure_28_edit_recipe_on_instance
+  revision: b9c745180c3b8bc7d8f2356f49ccbaf0e824b1e5
+  branch: master
   specs:
     right_agent (0.4.9)
       amqp (= 0.6.7)

spec/actors/instance_scheduler_spec.rb

@@ -105,7 +105,8 @@ def shutdown; EM.stop; end
       ::RightScale::Log.has_errors?.should be_false
 
       # ensure we have consumed all queued next_ticks instead of leaking them
-      EM.instance_variable_get(:@next_tick_queue).should be_nil
+      queue = EM.instance_variable_get(:@next_tick_queue)
+      (queue.nil? || queue.empty?).should be_true
     end
 
     after(:all) do

spec/instance/cook/executable_sequence_spec.rb

@@ -58,7 +58,7 @@ class ExecutableSequence
       @script.should_receive(:is_a?).with(RightScale::RightScriptInstantiation).and_return(true)
       @script.should_receive(:is_a?).with(RightScale::RecipeInstantiation).and_return(false)
 
-      @bundle = RightScale::ExecutableBundle.new([ @script ], [], 0, true, [], '', nil, [])
+      @bundle = RightScale::ExecutableBundle.new([ @script ], [], 0, true, [], '', {}, nil)
 
       @auditor = flexmock(RightScale::AuditStub.instance)
       @auditor.should_receive(:create_new_section)

spec/instance/instance/cook/executable_sequence_spec.rb

@@ -61,7 +61,7 @@ module RightScale
 
     it 'should look up repose servers' do
       flexmock(ReposeDownloader).should_receive(:discover_repose_servers).with([SERVER]).once
-      @bundle = ExecutableBundle.new([], [], 2, nil, [], [SERVER], {})
+      @bundle = ExecutableBundle.new([], [], 2, nil, [], [SERVER], {}, nil)
       @sequence = ExecutableSequence.new(@bundle)
     end
 
@@ -120,7 +120,7 @@ module RightScale
                                 "nonexistent cookbook")
         position = CookbookPosition.new("foo/bar", cookbook)
         sequence = CookbookSequence.new(['foo'], [position], ["deadbeef"])
-        @bundle = ExecutableBundle.new([], [], 2, nil, [sequence], [SERVER], {})
+        @bundle = ExecutableBundle.new([], [], 2, nil, [sequence], [SERVER], {}, nil)
       end
 
       it 'should successfully request a cookbook we can access' do