automate-standard-baseline 0.0.5 → 0.0.6

data/bin/automate-standard-baseline

@@ -15,10 +15,12 @@ include Seven::ASB::Operations
 
 
 $pid_file = '.pid'
+$config_file='asb.yml'
 
 # For now we hard code the timeout value in case of the 
 # program run more than 24 hours
 $time_out = 24 * 60 * 60
+$v_port=18080
 
 ##-------------------------------------------------------------
 ## define methods
@@ -167,6 +169,24 @@ def archive_logs(devices)
   Dir.mkdir('logs') unless Dir.exists?('logs')
 end
 
+def load_config()
+  config_info=nil
+  if File.exists?($config_file)
+    logger.info "config #{$config_file} exist."
+    config_info=YAML.load_file($config_file)  
+    
+    
+   if config_info.key?("time_out")
+    $time_out=config_info['time_out']
+   end
+   
+   if config_info.key?("v_port")
+    $v_port=config_info['v_port']
+   end
+  end
+  
+end
+
 ## operation steps ---start test ...
 
 trap_signals()
@@ -175,6 +195,8 @@ option = opt_parse(ARGV)
 
 logger.info "#{option}"
 
+load_config()
+
 check_if_old_process_killed($pid_file)
 
 devices = get_available_devices
@@ -214,7 +236,7 @@ for i in 0...devices.length
   set_env(devices[i],i)
  
   
-  install_or_dump_oc_client(option[:oc_path],option[:reinstall])
+  install_or_dump_oc_client(option[:oc_path],option[:reinstall],$v_port)
   reset_data()
 
   if option[:enable_logcat]

data/lib/automate-standard-baseline/operations.rb

@@ -17,6 +17,7 @@ module Operations
   @@default_device = nil
 
   @@default_time_out = 300 # 5 minutes
+  @@v_port=nil
   
   def default_device
     unless @@default_device
@@ -27,8 +28,9 @@ module Operations
   end
 
 
-  def install_or_dump_oc_client(path, reinstall = true)
+  def install_or_dump_oc_client(path, reinstall = true,port)
     
+    @@v_port=port
     
     if reinstall
         uri = URI.parse(path)
@@ -142,7 +144,8 @@ module Operations
         cmd = "#{adb_command} shell su -c iptables -t nat -nvL"
         log cmd
         result = exec_command(cmd, @@default_time_out)
-        raise "iptables is not modified" unless result.output.include?('redir ports 65002')
+        log "veirfy redirect port #{@@v_port}"
+        raise "iptables is not modified" unless result.output.include?("redir ports #{@@v_port}")
       end
       puts "oc client is started."  
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: automate-standard-baseline
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: retriable
-  requirement: &19215380 !ruby/object:Gem::Requirement
+  requirement: &14437900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19215380
+  version_requirements: *14437900
 - !ruby/object:Gem::Dependency
   name: sys-proctable
-  requirement: &19214360 !ruby/object:Gem::Requirement
+  requirement: &14436380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19214360
+  version_requirements: *14436380
 description: auomated standard baseline test
 email: rfu@seven.com
 executables: