actir 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 00404d5aea9546ffd7abdf543d300e2910547ac6
-  data.tar.gz: 829dba036ed2e748e49d7a44dba1dfd1b56141b7
+  metadata.gz: 0fe573a920382f2ad7315697bcb620fc97e2c06b
+  data.tar.gz: 09ec1a2c24d202158c6adf7a60deacda8bac7c23
 SHA512:
-  metadata.gz: 60309c7aa5e470d61aa7e3a61165a9ced30cd76a837331d8bada82bf933b94a15c94d99176b71a19b3c5ca43aef241b4e274aa8ede322640be1692187db2d8af
-  data.tar.gz: 77219578816c605892b2b10b48f6a434368b8b20c4c1588a77d5889b7e9b8ec942c041975b05fb7ef82f3217355c0ebcc1b8a6ab6565e2e52d1794a8acd5dc02
+  metadata.gz: b663a8f7b7af8edb7055769c437b5922d130e0c453d25ac1d3660692a3ee8952e15f47c35ed02fe5dc4eb8ded2f7043e549859ad1dc9a8cf8292abaf17cdd20d
+  data.tar.gz: 9fa74d0d701b9aaa3695e4e24456b4a5bcbf13eaf5a6a455a6149650d3970376411ebea0e203b07e09ce2a1f2a9048d74db8a00a5071cb16c1a867b076bd608b

data/lib/actir/parallel_tests/cli.rb

@@ -60,7 +60,13 @@ module Actir
 
           #更新百度支付-百付宝的cookies
           if options[:update]
-            Actir::CookiesBaidu.update_all
+            begin
+              Actir::CookiesBaidu.update_all
+            rescue Exception => e
+              #若更新baidu_cookies失败，则打印错误信息，并中断测试执行
+              puts e.message
+              abort "update baidu cookies failed!!!"
+            end
           end
 
           #计算重跑次数
@@ -170,7 +176,8 @@ module Actir
             Usage: ruby [switches] [--] [files & folders]
             Options are:
           BANNER
-          opts.on("-n [PROCESSES]", Integer, "How many processes to use, default: 1") { |n| options[:count] = n }
+          # opts.on("-n [PROCESSES]", Integer, "How many processes to use, default: 1") { |n| options[:count] = n }
+          opts.on("-n [TESTCASE]", String, "Run this testcase") { |casename| options[:testcase] = casename }
           opts.on("--group-by [TYPE]", <<-TEXT.gsub(/^          /, '')
           group tests by:
                       found - order of finding files

data/lib/actir/parallel_tests/test/re_run.rb

@@ -137,7 +137,7 @@ module Actir
 
           #获取失败用例名的正则
           def failure_tests_name_reg
-            /(test.+)\(.+\)/
+            /(test.+)\(.+\):/
           end
 
           #获取失败数据的正则

data/lib/actir/parallel_tests/test/runner.rb

@@ -29,11 +29,19 @@ module Actir
             #require_list = test_files.map { |file| file.sub(" ", "\\ ") }.join(" ")
             #cmd = "#{executable} -Itest -e '%w[#{require_list}].each { |f| require %{./\#{f}}}' #{address}"
             #execute_command(cmd, process_number, num_processes, options)
+
             cmd = ""
-            test_files.each do |file|
-              cmd += "#{executable} #{file} #{address};"
-            end 
-            cmd += "\n"
+            #如果有-n选项，则只运行指定的测试用例
+            if options[:testcase]
+              raise "more than one file was choosen" if test_files.size != 1 
+              cmd = "#{executable} #{test_files[0]} -n #{options[:testcase]} #{address}"
+            else
+              test_files.each do |file|
+                cmd += "#{executable} #{file} #{address};"
+              end 
+              cmd += "\n"
+            end
+
             result = execute_command(cmd, process_number, num_processes, options)
             #记录log
             if options[:log]

data/lib/actir/version.rb

@@ -1,3 +1,3 @@
 module Actir
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,111 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: actir
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - hub
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-06 00:00:00.000000000 Z
+date: 2015-09-28 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
@@ -159,17 +159,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.3
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Application Concurrence Test in Ruby.