foreman-tasks 0.9.1 → 0.9.2

data/test/unit/actions/action_with_sub_plans_test.rb

@@ -9,9 +9,7 @@ module ForemanTasks
     end
 
     # to be able to use the locking
-    class ::User < User.parent
-      include ForemanTasks::Concerns::ActionSubject
-    end
+    ::User.send(:include, ForemanTasks::Concerns::ActionSubject)
 
     class ParentAction < Actions::ActionWithSubPlans
       def plan(user)

data/test/unit/config/environment.rb

@@ -0,0 +1 @@
+# dummy appllication.rb - for unit testing dynflow-executor

data/test/unit/daemon_test.rb

@@ -0,0 +1,86 @@
+require 'test_helper'
+
+class DaemonTest < ActiveSupport::TestCase
+  setup do
+    @dynflow_memory_watcher = mock('memory_watcher')
+    @daemons = mock('daemons')
+    @daemon = ForemanTasks::Dynflow::Daemon.new(
+      @dynflow_memory_watcher,
+      @daemons
+    )
+    @world_class = mock('dummy world factory')
+    @dummy_world = Dynflow::Testing::DummyWorld.new
+    @dummy_world.stubs(:auto_execute)
+    @dummy_world.stubs(:terminated).returns(Concurrent.event)
+    @world_class.stubs(:new).returns(@dummy_world)
+    @dynflow = ForemanTasks::Dynflow.new(@world_class)
+    ForemanTasks.stubs(:dynflow).returns(@dynflow)
+    @dynflow.require!
+  end
+
+  test 'run command creates a watcher if memory_limit option specified' do
+    current_folder = File.expand_path('../', __FILE__)
+
+    @dynflow_memory_watcher.expects(:new).with do |_world, memory_limit, _watcher_options|
+      memory_limit == 1000
+    end
+    @daemon.stubs(:sleep).returns(true) # don't pause the execution
+
+    @daemon.run(current_folder, memory_limit: 1000)
+    # initialization should be performed inside the foreman environment,
+    # which is mocked here
+    @dynflow.initialize!
+  end
+
+  test 'run command sets parameters to watcher' do
+    current_folder = File.expand_path('../', __FILE__)
+
+    @dynflow_memory_watcher.expects(:new).with do |_world, memory_limit, watcher_options|
+      memory_limit == 1000 &&
+        watcher_options[:polling_interval] == 100 &&
+        watcher_options[:initial_wait] == 200
+    end
+    @daemon.stubs(:sleep).returns(true) # don't pause the execution
+
+    @daemon.run(
+      current_folder,
+      memory_limit: 1000,
+      memory_polling_interval: 100,
+      memory_init_delay: 200
+    )
+    # initialization should be performed inside the foreman environment,
+    # which is mocked here
+    @dynflow.initialize!
+  end
+
+  test 'run_background command executes run with all params set as a daemon' do
+    @daemon.expects(:run).twice.with do |_folder, options|
+      options[:memory_limit] == 1000 &&
+        options[:memory_init_delay] == 100 &&
+        options[:memory_polling_interval] == 200
+    end
+    @daemons.expects(:run_proc).twice.yields
+
+    @daemon.run_background(
+      'start',
+      executors_count: 2,
+      memory_limit: 1000,
+      memory_init_delay: 100,
+      memory_polling_interval: 200
+    )
+  end
+
+  test 'default options read values from ENV' do
+    ENV['EXECUTORS_COUNT'] = '2'
+    ENV['EXECUTOR_MEMORY_LIMIT'] = '1gb'
+    ENV['EXECUTOR_MEMORY_MONITOR_DELAY'] = '3'
+    ENV['EXECUTOR_MEMORY_MONITOR_INTERVAL'] = '4'
+
+    actual = @daemon.send(:default_options)
+
+    assert_equal 2, actual[:executors_count]
+    assert_equal 1.gigabytes, actual[:memory_limit]
+    assert_equal 3, actual[:memory_init_delay]
+    assert_equal 4, actual[:memory_polling_interval]
+  end
+end

data/test/unit/task_test.rb

@@ -52,6 +52,23 @@ class TasksTest < ActiveSupport::TestCase
     end
   end
 
+  describe 'task without valid execution plan' do
+    let(:task) do
+      FactoryGirl.create(:dynflow_task).tap do |task|
+        task.external_id = 'missing-task'
+      end
+    end
+
+    it 'handles the error while loading the task and does not propagate errors unless necessary' do
+      task.cancellable?
+      task.resumable?
+      task.main_action
+      assert_equal 'Support::DummyDynflowAction', task.get_humanized(:humanized_name)
+      assert_equal 0, task.progress
+      assert_raises(KeyError) { task.cancel }
+    end
+  end
+
   describe 'subtask count querying' do
     let(:result_base) do
       {
@@ -82,7 +99,8 @@ class TasksTest < ActiveSupport::TestCase
       end
 
       it 'calculates the progress report correctly when using batch planning' do
-        result_base = result_base.merge(:success => 1, :error => 1, :total => 25)
+        # rubocop:disable Style/RedundantSelf - not redundant, as otherwise it conflicts with local variable
+        result_base = self.result_base.merge(:success => 1, :error => 1, :total => 25)
         fake_action = OpenStruct.new(:total_count => 25)
         task.stubs(:main_action).returns(fake_action)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-28 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks-core
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.22
+        version: 0.8.24
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.22
+        version: 0.8.24
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.4
+- !ruby/object:Gem::Dependency
+  name: get_process_mem
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   The goal of this plugin is to unify the way of showing task statuses across the Foreman instance.
   It defines Task model for keeping the information about the tasks and Lock for assigning the tasks
@@ -228,6 +242,7 @@ files:
 - lib/tasks/gettext.rake
 - locale/Makefile
 - locale/action_names.rb
+- locale/en/LC_MESSAGES/foreman_tasks.mo
 - locale/en/foreman_tasks.po
 - locale/foreman_tasks.pot
 - script/rails
@@ -243,6 +258,8 @@ files:
 - test/unit/actions/action_with_sub_plans_test.rb
 - test/unit/actions/proxy_action_test.rb
 - test/unit/cleaner_test.rb
+- test/unit/config/environment.rb
+- test/unit/daemon_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
 - test/unit/proxy_selector_test.rb
 - test/unit/recurring_logic_test.rb
@@ -268,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Foreman plugin for showing tasks information for resoruces and users
@@ -285,6 +302,8 @@ test_files:
 - test/unit/actions/action_with_sub_plans_test.rb
 - test/unit/actions/proxy_action_test.rb
 - test/unit/cleaner_test.rb
+- test/unit/config/environment.rb
+- test/unit/daemon_test.rb
 - test/unit/dynflow_console_authorizer_test.rb
 - test/unit/proxy_selector_test.rb
 - test/unit/recurring_logic_test.rb