CloudWebManage/cwm-worker-cluster#180: Update tests and improve code coverage. (#5)

* [CWM-180] Update tests and improve code coverage.

Signed-off-by: Azeem Sajid <azeem.sajid@gmail.com>

* Iterate on events for flushing instead of lines.

* Rename last action method. Update tests.

Author: iamazeem

lib/fluent/plugin/in_http_cwm.rb

@@ -92,13 +92,7 @@ def start
 
         # start interval timer to flush last action entry
         timer_execute(:last_action_flush_timer, '1s') do
-          if @last_action_entry.empty?
-            @last_action_entry = @last_action_queue.deq.split('|')
-            log.debug("Dequed last action entry. #{@last_action_entry}")
-          else
-            deploymentid, last_action = @last_action_entry
-            @last_action_entry = [] if update_deployment_last_action(deploymentid, last_action)
-          end
+          flush_last_action
         end
 
         log.info("Starting HTTP server [#{@host}:#{@port}]...")
@@ -155,6 +149,16 @@ def route(data)
         router.emit(@tag, time, record)
       end
 
+      def flush_last_action
+        if @last_action_entry.empty?
+          @last_action_entry = @last_action_queue.deq.split('|')
+          log.debug("Dequed last action entry. #{@last_action_entry}")
+        else
+          deploymentid, last_action = @last_action_entry
+          @last_action_entry = [] if update_deployment_last_action(deploymentid, last_action)
+        end
+      end
+
       def datetime_diff_in_secs(dt_begin, dt_end)
         seconds = ((dt_end - dt_begin) * 24 * 60 * 60)
         seconds.to_i

test/plugin/test_in_http_cwm.rb

@@ -8,9 +8,26 @@ class CwmHttpInputTest < Test::Unit::TestCase
   setup do
     Fluent::Test.setup
 
-    @default_conf = %(
-      tag       test
-    )
+    @default_conf = config_element('ROOT', '', { 'tag' => 'test' })
+    @custom_conf = config_element('ROOT', '', { 'tag' => 'test' }, [
+                                    config_element('redis', '', {
+                                                     'grace_period' => '1s',
+                                                     'flush_interval' => '1s'
+                                                   })
+                                  ])
+
+    @expected_redis_output = {
+      'deploymentid:last_action:docker-compose-http' => '',
+      'deploymentid:last_action:docker-compose-https' => '',
+      'deploymentid:minio-metrics:docker-compose-http:bytes_in' => '61852',
+      'deploymentid:minio-metrics:docker-compose-https:bytes_in' => '14875',
+      'deploymentid:minio-metrics:docker-compose-http:bytes_out' => '112012',
+      'deploymentid:minio-metrics:docker-compose-https:bytes_out' => '2755',
+      'deploymentid:minio-metrics:docker-compose-http:num_requests_out' => '7',
+      'deploymentid:minio-metrics:docker-compose-http:num_requests_in' => '10',
+      'deploymentid:minio-metrics:docker-compose-https:num_requests_in' => '5',
+      'deploymentid:minio-metrics:docker-compose-http:num_requests_misc' => '5'
+    }.freeze
   end
 
   def create_driver(conf)
@@ -27,13 +44,7 @@ def create_driver(conf)
     end
 
     test 'redis default configuration test' do
-      conf = %(
-        tag     test
-        <redis>
-        </redis>
-      )
-
-      driver = create_driver(conf)
+      driver = create_driver(@default_conf)
       plugin = driver.instance
       redis = plugin.redis_config
       assert_equal 'localhost', redis.host
@@ -47,7 +58,9 @@ def create_driver(conf)
 
   sub_test_case 'route#emit' do
     test 'emit test' do
-      driver = create_driver(@default_conf)
+      driver = create_driver(@custom_conf)
+      plugin = driver.instance
+      redis = plugin.redis_config
 
       res_codes = []
       lines = 0
@@ -63,6 +76,25 @@ def create_driver(conf)
       assert_equal lines, res_codes.size
       assert_equal '200', res_codes[0]
       assert_equal 1, res_codes.uniq.size
+
+      # run and test private flushing methods
+      `redis-cli FLUSHALL`
+      sleep(redis.grace_period)
+      driver.events.each do
+        plugin.send(:flush_api_metrics)
+        plugin.send(:flush_last_action)
+      end
+
+      # verify from Redis server
+      @expected_redis_output.each do |key, expected_value|
+        if key.include? 'last_action'
+          exists = `redis-cli EXISTS #{key}`.chomp
+          assert_equal '1', exists
+        else
+          actual_value = `redis-cli GET #{key}`.chomp
+          assert_equal expected_value, actual_value
+        end
+      end
     end
   end