actir 1.4.1.3 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f893b2a08e16d02bda24b542460e64593346ee4e
-  data.tar.gz: 4473e22322a40df9acd73d4de8bdebbc00bf5b05
+  metadata.gz: b43d744c66c2dd1e24f9e64b7d2646636c15a793
+  data.tar.gz: 23f165b5dd8b7ccf7e198d6d8f10c4b56395c2f1
 SHA512:
-  metadata.gz: 9b5f36f880aaca09b07df9eec89dfe54aa62c615cffe6a6c7e5290fdf178610ce9d5bbb43ab83e6d0cd6b21ecbe37523d80486491ac70f9b422b8bb307138759
-  data.tar.gz: bf237b98db9052f8a5b75632cf6211e0630611b03bf3ba496e2bedbce45381656329057ec7c0f173ecbad65e8d30ae9429c35169a4050c42fafb78067cf11f7a
+  metadata.gz: 6b47142432f0de33ffb80f45f402c6b0ea78714b7edd4c108fb243e8d45b795c154be3b236b70ea7c7e3fd8770254a2bef290a82968e0dc3aec98d708b39f47b
+  data.tar.gz: 4b7c59ff5a59442be44fa29abce1b2005fe59ca03bc3d0b8419b3645602e7cbc96e97b052b335f0afaced329e96802faa49aef9917285ca2b4af510b96004910

data/lib/actir/parallel_tests/cli.rb

@@ -34,18 +34,6 @@ module Actir
       def run_tests_in_parallel(num_processes, options)
         test_results = nil
         
-        #修改全局变量$env至对应的预发布环境的名字
-        # if options[:pre_name]
-        #   # 不等于当前的预发环境
-        #   if options[:pre_name] != $env
-        #     $env = options[:pre_name]
-        #   end
-        # else
-        #   if options[:pre_name] != $env
-        #     $env = "online"
-        #   end
-        # end
-
         report_time_taken do
           groups = @runner.tests_in_groups(options[:files], num_processes, options)
 
@@ -53,22 +41,26 @@ module Actir
           # @Date : 2015.3.9
           # 远程执行模式下获取服务器IP和端口号
           address = []
-          if $mode == :remote
-            address = Actir::Remote.get_remote_address(num_processes)
-            num_processes = address.size
-          end
+          # if $mode == :remote
+          #   address = Actir::Remote.get_remote_address(num_processes)
+          #   num_processes = address.size
+          # end
 
           #更新百度支付-百付宝的cookies
           #-u为强制更新，若没有加强制更新命令，则每天自动更新一次
-          if options[:update] || !(Actir::Config.is_same_day?("cookies", Actir::CookiesBaidu.cookies_path))
-            begin
-              Actir::CookiesBaidu.update_all
-            rescue Exception => e
-              #若更新baidu_cookies失败，则关闭浏览器，打印错误信息，并中断测试执行
-              Actir::CookiesBaidu.clear_after_failure
-              puts "Exception: #{e.message} in"
-              puts e.backtrace
-              abort "update baidu cookies failed!!!"
+          #qatest模式则不需要更新baiducookies，qatest环境的百度支付已mock
+          if $env == "online"
+            Actir::CookiesBaidu.init
+            if options[:update] || !(Actir::Config.is_same_day?("cookies", Actir::CookiesBaidu.directory))
+              begin
+                Actir::CookiesBaidu.update_cookies("card1")
+              rescue Exception => e
+                #若更新baidu_cookies失败，则关闭浏览器，打印错误信息，并中断测试执行
+                Actir::CookiesBaidu.clear_after_failure
+                puts "Exception: #{e.message} in"
+                puts e.backtrace
+                abort "update baidu cookies failed!!!"
+              end
             end
           end
 
@@ -77,7 +69,7 @@ module Actir
           #报用例数
           report_number_of_tests(groups)
           #报执行环境
-          report_address_of_env(address)
+          # report_address_of_env(address)
           #并发执行不同group中的测试用例
           test_results = execute_in_parallel(groups, groups.size, options) do |group|
             p_num = groups.index(group)
@@ -179,7 +171,7 @@ module Actir
         @runner = load_runner("test")
         OptionParser.new do |opts|
           opts.banner = <<-BANNER.gsub(/^          /, '')
-            Run all tests in parallel
+            Run all testcase in parallel
             Usage: actir [switches] [--] [files & folders] [-] [testcase_name]
             Options are:
           BANNER
@@ -192,53 +184,19 @@ module Actir
           #             default - filesize
           #   TEXT
           #   ) { |type| options[:group_by] = type.to_sym }
+          opts.on("-e [online][qatest]", String, "set environment to run testcase, default: online") { |env| env = "online" if ((env != "qatest" && env != "online")|| (env == nil)); $env = env;}
           opts.on("-r [TIMES]", "--rerun [TIMES]", Integer, "rerun times for failure&error testcase, default: 0") { |n| options[:rerun] = n }
-          #opts.on("-m [FLOAT]", "--multiply-processes [FLOAT]", Float, "use given number as a multiplier of processes to run") { |multiply| options[:multiply] = multiply }
-          # opts.on("-i", "--isolate",
-          #   "Do not run any other tests in the group used by --single(-s)") do |pattern|
-          #   options[:isolate] = true
-          # end
-          opts.on("-e", "--exec [COMMAND]", "execute this code parallel") { |path| options[:execute] = path }
-          # opts.on("--serialize-stdout", "Serialize stdout output, nothing will be written until everything is done") { options[:serialize_stdout] = true }
-          # opts.on("--combine-stderr", "Combine stderr into stdout, useful in conjunction with --serialize-stdout") { options[:combine_stderr] = true }
-          # opts.on("--non-parallel", "execute same commands but do not in parallel, needs --exec") { options[:non_parallel] = true }
-          # opts.on("--nice", "execute test commands with low priority") { options[:nice] = true }
+          opts.on("-u", "--update", "Update Baifubao's cookies") { options[:update] = true }
           opts.on("--verbose", "Print more output") { options[:verbose] = true }
           opts.on("--log", "record exec result to logfile") { options[:log] = true}
           opts.on("--report", "make a report to show the test result") { options[:report] = true}
           # opts.on("--remote", "run testcase in remote environment") { options[:mode] = :remote }
           # opts.on("--local", "run testcase in local environment") { options[:mode] = :local }
-          # # 填写预发环境，目前只支持bjpre2-4，别的后续再添加
-          # opts.on("-p", "--pre [PRE]", <<-TEXT.gsub(/^          /, '')
-          # set pre environment to run testcase:
-          #             bjpre2
-          #             bjpre3
-          #             bjpre4
-          #   TEXT
-          #   ) { |pre| pre = "online" if ( pre != "bjpre2" && pre != "bjpre3" && pre != "bjpre4"); options[:pre_name] = pre }
-          #add by Hub
-          #-u commnd, update baifubao's cookies
-          opts.on("-u", "--update", "Update Baifubao's cookies") { options[:update] = true }
-          #add by Hub 
-          #-s commnd, show test mode,and remote env ipaddress
-          # opts.on("-s", "--show [PATH]", "Show Test Mode") do |path|
-          #   abort "Please input project directory path!" if path == nil
-          #   $project_path = File.join(Dir.pwd, path)
-          #   puts division_str
-          #   if Actir::Config.get("config.test_mode.env") == :local
-          #     puts "mode : Local"
-          #   else
-          #     puts "mode : Remote"
-          #     node_name = Actir::Config.get("config.test_mode.docker.name")
-          #     address = Actir::Remote.get_remote_address
-          #     puts "node_num : " + address.size.to_s
-          #     address.each_with_index do |address, i|
-          #       puts $env + node_name + (i+1).to_s + " : " + address
-          #     end
-          #   end
-          #   puts division_str
-          #   exit
-          # end
+                    # opts.on("-e", "--exec [COMMAND]", "execute this code parallel") { |path| options[:execute] = path }
+          # opts.on("--serialize-stdout", "Serialize stdout output, nothing will be written until everything is done") { options[:serialize_stdout] = true }
+          # opts.on("--combine-stderr", "Combine stderr into stdout, useful in conjunction with --serialize-stdout") { options[:combine_stderr] = true }
+          # opts.on("--non-parallel", "execute same commands but do not in parallel, needs --exec") { options[:non_parallel] = true }
+          # opts.on("--nice", "execute test commands with low priority") { options[:nice] = true }
           opts.on("-h", "--help", "Show this.") { puts opts; exit }
         end.parse!(argv)
 

data/lib/actir/script/cookies_baidu.rb

@@ -1,16 +1,59 @@
-require 'watir-webdriver'
-
 module Actir
   class CookiesBaidu
 
     class << self
 
+      # cookies文件初始化
+      def init
+        need_init_cookies = false
+        
+        #判断文件是否存在
+        if file_exists?
+          # 读取下配置文件中是否真的有cookies数据，如果没有一样要更新
+          cookies = get_cookies("card1")
+          # 判断存在的cookies文件是否有规范的cookies内容
+          if cookies == nil
+            need_init_cookies = true
+          else
+            if cookies.has_key?(baifubao_BDUSS) && cookies.has_key?(baifubao_STOKEN)
+              if cookies[baifubao_BDUSS] == nil || cookies[baifubao_STOKEN] == nil
+                need_init_cookies = true
+              else
+                need_init_cookies = false
+              end
+            else
+              need_init_cookies = true
+            end
+          end 
+
+        else
+          if directory_exists?
+            #文件不存在则看目录是否存在
+            #目录存在则创建文件
+            need_init_cookies = true
+          else
+            #目录和文件都不存在则创建目录再创建文件
+            Dir.mkdir(directory)
+            need_init_cookies = true
+          end
+        end
+
+        if need_init_cookies == true
+          file = File.new(directory + file_name, "w")
+          file.syswrite(init_content)
+          file.close
+          # 暂时先只更新一张卡吧
+          update_cookies("card1")
+        end
+
+      end
+
       # 更新百度账号所有的配置文件
       def update_all(address = [])
         baidu_card = Actir::Config.get(baifubao_key)
         # 确认目前可用的卡的数目和cookies文件上的是否匹配
         # TODO 先不实现,cookies文件上的cards数量过多目前看不影响
-        # baidu_card_cookies = Actir::Config.get("cookies", cookies_path)
+        # baidu_card_cookies = Actir::Config.get("cookies", directory)
         # if baidu_card_cookies != nill && baidu_card != nil
         #   if baidu_card_cookies.size > baidu_card.size
         #
@@ -27,7 +70,7 @@ module Actir
       def re_available
         #每次登陆都判断一下cookies文件的上一次修改时间和当前时间
         #如果日期不同，则刷新所有的pay文件中baidu-card的状态
-        unless Actir::Config.is_same_day?("cookies", cookies_path)
+        unless Actir::Config.is_same_day?("cookies", directory)
           Actir::Config.lock("pay") do
             str_array = IO.readlines(baifubao_account_file)
             str_array.each_with_index do |line, index|
@@ -55,10 +98,10 @@ module Actir
         baidu_card.each do |key, value|
           if value["available"] == true
             # 顺便取一下cookies
-            baidu_card_cookies = Actir::Config.get("cookies." + key, cookies_path)
+            baidu_card_cookies = Actir::Config.get("cookies." + key, directory)
             # value["BAIDUID"] = baidu_card_cookies["BAIDUID"]
-            value["BDUSS"] = baidu_card_cookies["BDUSS"]
-            value["STOKEN"] = baidu_card_cookies["STOKEN"]
+            value[baifubao_BDUSS] = baidu_card_cookies[baifubao_BDUSS]
+            value[baifubao_STOKEN] = baidu_card_cookies[baifubao_STOKEN]
             #有可用的卡，取出cookies等参数
             card.store(key, value)
             break
@@ -69,18 +112,10 @@ module Actir
       end
 
       # 设置不可用的卡
-      # 入参传入卡的key
       def set_useless_card(card)
         Actir::Config.set(baifubao_key + "." + card + "." + "available", "false")
       end
 
-      # 更新baidu_cookies失败后的清理操作。目前需要手动调用，后续优化
-      def clear_after_failure
-        if @browser != nil
-          @browser.close
-        end
-      end
-
       # 更新配置文件中的baidu_cookies
       def update_cookies(card, address = [])
         #打开百付宝
@@ -124,29 +159,51 @@ module Actir
       def get_baifubao_cookies
         sleep 3
         # id =  @browser.cookies[:BAIDUID][:value]
-        ss =  @browser.cookies[:BDUSS][:value]
-        stoken =  @browser.cookies[:STOKEN][:value]
+        ss =  @browser.cookies[baifubao_BDUSS.to_sym][:value]
+        stoken =  @browser.cookies[baifubao_STOKEN.to_sym][:value]
         @browser.close
         #cookies = "  BAIDUID:\s\s\s\s\s\s\"" + id + "\"\n  BDUSS:\s\s\s\s\s\s\s\s\"" + ss + "\"\n"
         #以hash形式返回
         # {:BAIDUID => id, :BDUSS => ss } 
-        {:BDUSS => ss, :STOKEN => stoken}
+        {baifubao_BDUSS.to_sym => ss, baifubao_STOKEN.to_sym => stoken}
+      end
+
+      # 更新baidu_cookies失败后的清理操作。目前需要手动调用，后续优化
+      def clear_after_failure
+        if @browser != nil
+          @browser.close
+        end
       end
 
       def modify_cookies(card, cookies)
         cookies.each do |key, value|
-          Actir::Config.set("cookies" + "." + card + "." + key.to_s , "\"" + value.to_s + "\"", cookies_path)
+          Actir::Config.set("cookies" + "." + card + "." + key.to_s , "\"" + value.to_s + "\"", directory)
         end
       end
 
-      # 配置文件的上一级路径
-      def cookies_path
-        File.join(File.dirname(__FILE__), "cookies")
+      def get_cookies(card)
+        Actir::Config.get("cookies" + "." + card, directory)
+      end
+
+      def file_exists?
+        File::exists?(directory + file_name)
+      end
+
+      def directory_exists?
+        File::directory?(directory)
+      end
+
+      # 获取cookies文件的路径
+      # 因为涉及到权限问题,路径需要放在个人账号目录下
+      # 通过whoami命令获取当前账户名称
+      # 暂时存放在/User/xx/目录下
+      def directory
+        user_name = `whoami`
+        return "/Users/" + user_name.chomp + "/cookies/"
       end
 
-      # 配置文件相对路径
-      def cookies_file
-        File.join(File.dirname(__FILE__), "cookies", "/cookies.yaml")
+      def file_name
+        "cookies.yaml"
       end
 
       # 百度账号配置文件
@@ -154,6 +211,25 @@ module Actir
         File.join(Actir::Config.default_config_dir, "/pay.yaml")
       end
 
+      # 默认的配置文件内容，cookies的key
+      def init_content
+        "card1:\n" + 
+        "  " + baifubao_BDUSS  + ": \n" + 
+        "  " + baifubao_STOKEN + ": \n"
+      end
+
+
+      private
+
+
+      def baifubao_BDUSS
+        "BDUSS"
+      end
+
+      def baifubao_STOKEN
+        "STOKEN"
+      end
+
       def baifubao_key
         "pay.baifubao"
       end

data/lib/actir/version.rb

@@ -1,3 +1,3 @@
 module Actir
-  VERSION = "1.4.1.3"
+  VERSION = "1.4.2"
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: actir
 version: !ruby/object:Gem::Version
-  version: 1.4.1.3
+  version: 1.4.2
 platform: ruby
 authors:
 - hub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.11
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.45'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.45'
 - !ruby/object:Gem::Dependency
   name: parallel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.9'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Distribut automated testing framework for Web or App.
@@ -117,8 +117,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - README.md
@@ -143,9 +143,7 @@ files:
 - lib/actir/parallel_tests/test/result.rb
 - lib/actir/parallel_tests/test/runner.rb
 - lib/actir/remote.rb
-- lib/actir/script/cookies/cookies.yaml
 - lib/actir/script/cookies_baidu.rb
-- lib/actir/script/cookies_file.rb
 - lib/actir/version.rb
 - lib/actir/webdriver/browser.rb
 - lib/actir/webdriver/browser_options.rb
@@ -162,17 +160,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Application Concurrence Test in Ruby.

data/lib/actir/script/cookies/cookies.yaml

@@ -1,12 +0,0 @@
-card1:
-  BDUSS:        "VEU1hqU3Z5dFZHcm9HSjJRSVhwWFp4QXVRRFRuaEtXM1JEU0NjNEl0Y1kzenRYQUFBQUFBJCQAAAAAAAAAAAEAAAD-BrRddGVzdHdsMjAxNAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABhSFFcYUhRXc0"
-  STOKEN:       "1b54ebe1214d9a3d8eb4613888466a03f54bdd9ffce389416d360761d5b39b0d"
-card2:
-  BDUSS:
-  STOKEN:
-card3:
-  BDUSS:
-  STOKEN:
-card4:
-  BDUSS:
-  STOKEN:

data/lib/actir/script/cookies_file.rb

@@ -1,25 +0,0 @@
-module Actir
-  class CookiesFile
-    class << self
-
-      # 获取cookies文件的路径
-      # 因为涉及到权限问题,路径需要放在个人账号目录下
-      # 通过whoami命令获取当前账户名称
-      # 暂时存放在/User/xx/目录下
-      def path
-        user_name = `whoami`
-        return "/Users/" + user_name + "/"
-      end
-
-      def name
-        return "cookies.yaml"
-      end
-
-      def exists?
-        File::exists?(path + name)
-      end
-
-    end
-
-  end
-end