automate-standard-baseline 0.0.1 → 0.0.2

data/bin/automate-standard-baseline

@@ -266,18 +266,27 @@ rescue Timeout::Error
   logger.info 'Test duartion has over, pull tcpdump.'
   
   pull_out_tcpdump(devices)
-  delete_pid_file($pid_file)
 
-  logger.info "Kill all sub_processes"
+  logger.info "Kill sub-processes"
   # find the sub-processes of these pids
-  to_kill = [Process.pid]
+  #main = [Process.pid]
+  #logger.info "Main process #{main}"
+  
+  to_kill=[Process.pid]
   ProcTable.ps do |proc|
-      to_kill << proc.pid if to_kill.include?(proc.ppid)
+     to_kill << proc.pid if to_kill.include?(proc.ppid)
   end
-  logger.info "Processes will be killed (including sub-processes): #{to_kill}"
+  
+  #delete the main process in case of kill itself 
+  to_kill.delete_at(0)
+  logger.info "Processes will be killed : #{to_kill}"
   to_kill.each do |pid|
-      Process.kill("KILL", pid) rescue nil # in case of the process doesn't exist. 
+     Process.kill("KILL", pid) rescue nil # in case of the process doesn't exist. 
   end
+  
+  delete_pid_file($pid_file) 
+  logger.info "Done."
+  #logger.info "Done. Please use command \"abs-stop -a\" to stop the test"
 end
 
 

data/lib/helpers.rb

@@ -109,7 +109,9 @@ def download_file(url, saved_path = nil)
   uri = URI.parse(url)
   path = (!uri.query or uri.query.blank?) ? uri.path : uri.path+"?"+uri.query
   unless saved_path
-    saved_path = "oc_apks/#{uri.path[uri.path.rindex("/") + 1, uri.path.length]}"
+    saved_path = 'oc_apks'
+    Dir.mkdir(saved_path) unless Dir.exists?(saved_path)
+    saved_path = "#{saved_path}/#{uri.path[uri.path.rindex("/") + 1, uri.path.length]}"
   end
   saved_path = File.expand_path(saved_path)
   puts "Download file by url #{url}; saved_path: #{saved_path}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automate-standard-baseline
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15690080 !ruby/object:Gem::Requirement
+  requirement: &12927560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15690080
+  version_requirements: *12927560
 description: auomated standard baseline test
 email: rfu@seven.com
 executables: