test macos

daipom · Nov 25, 2024 · 3215d27 · 3215d27
1 parent feda2ea
commit 3215d27
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -2,7 +2,6 @@ name: Test
 
 on:
   push:
-    branches: [master]
     paths-ignore:
       - '*.md'
       - 'lib/fluent/version.rb'
@@ -25,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: ['ubuntu-latest', 'macos-latest', 'windows-latest']
+        os: ['macos-latest']
         ruby-version: ['3.3', '3.2', '3.1', '3.0', '2.7']
 
     name: Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}
@@ -42,4 +41,4 @@ jobs:
       - name: Install dependencies
         run: bundle install
       - name: Run tests
-        run: bundle exec rake test TESTOPTS="-v --no-show-detail-immediately"
+        run: bundle exec rake test TESTOPTS="-v --no-show-detail-immediately -t'TestFluentdCommand::zero_downtime_restart'"
diff --git a/test/command/test_fluentd.rb b/test/command/test_fluentd.rb
@@ -1400,7 +1400,7 @@ def conf(udp_port, tcp_port, syslog_port)
     def run_fluentd(config)
       conf_path = create_conf_file("test.conf", config)
       assert File.exist?(conf_path)
-      cmdline = create_cmdline(conf_path)
+      cmdline = create_cmdline(conf_path, "-vv")
 
       stdio_buf = ""
       execute_command(cmdline) do |pid, stdout|
@@ -1464,7 +1464,7 @@ def send_end(port)
     end
 
     test "should restart with zero downtime (no data loss)" do
-      print_logs = false # set true if you need to print logs for debug
+      print_logs = true # set true if you need to print logs for debug
 
       udp_port, syslog_port = unused_port(2, protocol: :udp)
       tcp_port = unused_port(protocol: :tcp)
@@ -1513,20 +1513,29 @@ def send_end(port)
         elsif phase == "flush"
           phase = "done"
           threads << Thread.new do
-            sleep 5
+            sleep 10
             send_end(tcp_port)
           end
         end
       end
 
       assert_equal(
-        [(0..499).to_a, (0..499).to_a, (0..499).to_a],
+        [500, 500, 500],
         [
-          records_by_type["udp"].sort,
-          records_by_type["tcp"].sort,
-          records_by_type["syslog"].sort,
+          records_by_type["udp"].size,
+          records_by_type["tcp"].size,
+          records_by_type["syslog"].size,
         ]
       )
+
+      # assert_equal(
+      #   [(0..499).to_a, (0..499).to_a, (0..499).to_a],
+      #   [
+      #     records_by_type["udp"].sort,
+      #     records_by_type["tcp"].sort,
+      #     records_by_type["syslog"].sort,
+      #   ]
+      # )
     ensure
       threads.each(&:kill)
     end