yamatanooroti 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92dcb67921820e4dedad1aed9de7d18c062f623c9b73c4a05427049111217f4a
-  data.tar.gz: 5683fb3c7544c67dc4c1f024df1b8fd9953c6378be0826a6f834191cf5c694e8
+  metadata.gz: c50ad7cbec4e89075f4acc1c3060abdc3451177a5087460a4e5120db8cbe62ba
+  data.tar.gz: 2e0b61f737a29e7eb949f6594bb1718dbb761555a22cd05a686fafddd931f228
 SHA512:
-  metadata.gz: 6c614da80dcaf5b4ff0799be9be726fa0ea61fcc8ae1f53a4219e61cb17a86d3dee3e9e3fce5663b7224493b53ee0f379359859f448b10963306959647169c16
-  data.tar.gz: 0e2d1c4d031666509d85c5abc5a8d0f847d3c50392aec52df6f920269ebdff7fb99ac0442c1e582e8edd06f74f124dc9de559a5db8bc271510b331afbdc0f53b
+  metadata.gz: 2a9a3071d7eac0a2036fe3671b21a98fb84469ccb89a472380163f6d4ea98043925cff1a9548244d23d2aa44bac2cb062da6cdc0655b8c73fb54ec2136da5214
+  data.tar.gz: 6aabb244234bdd034fc0a870726b8d5ecf88e526c2a4483916c9a1caec51901d5408435b20a50053b25e019ad152e90a9935853e4c6c9db290dc0e383f1321ce

data/lib/yamatanooroti/version.rb

@@ -1,3 +1,3 @@
 class Yamatanooroti
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/yamatanooroti/windows.rb

@@ -360,28 +360,38 @@ module Yamatanooroti::WindowsTestCaseModule
     pe.dwSize = DL::PROCESSENTRY32W.size
     r = DL.Process32FirstW(h_snap, pe)
     error_message(r, "Process32First")
+    process_table = {}
     loop do
       #log "a #{pe.th32ParentProcessID.inspect} -> #{pe.th32ProcessID.inspect} #{wc2mb(pe.szExeFile.pack('S260')).unpack('Z*').pack('Z*')}"
-      if pe.th32ParentProcessID == DL.GetCurrentProcessId
-        h_child_proc = DL.OpenProcess(DL::PROCESS_ALL_ACCESS, 0, pe.th32ProcessID)
-        if (h_child_proc)
-          r = DL.TerminateProcess(h_child_proc, 0)
-          error_message(r, "TerminateProcess")
-          r = DL.CloseHandle(h_child_proc)
-          error_message(r, "CloseHandle")
-        end
-      end
+      process_table[pe.th32ParentProcessID] ||= []
+      process_table[pe.th32ParentProcessID] << pe.th32ProcessID
       break if DL.Process32NextW(h_snap, pe).zero?
     end
-    r = DL.TerminateThread(@pi.hThread, 0)
-    error_message(r, "TerminateThread")
-    sleep @wait
+    process_table[DL.GetCurrentProcessId].each do |child_pid|
+      kill_process_tree(process_table, child_pid)
+    end
+    #r = DL.TerminateThread(@pi.hThread, 0)
+    #error_message(r, "TerminateThread")
+    #sleep @wait
     r = DL.FreeConsole()
     #error_message(r, "FreeConsole")
     r = DL.AttachConsole(DL::ATTACH_PARENT_PROCESS)
     error_message(r, 'AttachConsole')
   end
 
+  private def kill_process_tree(process_table, pid)
+    process_table[pid]&.each do |child_pid|
+      kill_process_tree(process_table, child_pid)
+    end
+    h_proc = DL.OpenProcess(DL::PROCESS_ALL_ACCESS, 0, pid)
+    if (h_proc)
+      r = DL.TerminateProcess(h_proc, 0)
+      error_message(r, "TerminateProcess")
+      r = DL.CloseHandle(h_proc)
+      error_message(r, "CloseHandle")
+    end
+  end
+
   def close
     sleep @wait
     # read first before kill the console process including output

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yamatanooroti
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - aycabta
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-03 00:00:00.000000000 Z
+date: 2020-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -70,7 +70,7 @@ homepage: https://github.com/aycabta/yamatanooroti
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -86,7 +86,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Multi-platform real(?) terminal test framework
 test_files: []