flaky 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cf7699d7c56047300c55e11b4c245263887beeb
-  data.tar.gz: 06104c1442a6380ccb4dddd9ccb3c7aeaa92b09e
+  metadata.gz: aec17b5e5abd6c3698c2b5888db960a6366f0d77
+  data.tar.gz: add4521290cec54027742252bc4afbfc4121f49c
 SHA512:
-  metadata.gz: a6b0bebc614feb4d5dbc7987b2d9108fcc82706b013e10ef85d68b7111da253ce45e5e864e9124784a8d84ef1c3272500030ee01a9e1c0a2a9fc367b05f7a98c
-  data.tar.gz: e59cb9e08e7d188e196a4e5fe649076d873e5d9e8af7038698e13393606342d8235235492913ba0f16872a3df4ebc0c87c2cc1c2853963dfca379359857f98ec
+  metadata.gz: d15d2721d5119b385fc06b96eb0791bbfbe99e1cfa2d9d98a4e2490bc93ca5d25427c89812b9aa79e98ac42e3a2630775f67b88a0dca4e5ce16bfd7e3df25a93
+  data.tar.gz: e243b5c9e240f198ce0ee8e1c1c86d3269b5f6af901f9e2ff33b1e92b19c247e9d5f08caba5112f74c22ecc0b2fc5e984c1781a1216e097162265ead0b27ce99

data/bin/flake

@@ -17,17 +17,29 @@ flake 3 ios files.txt
 MSG
 
 if ARGV && ARGV.length === 1 && ARGV.first === 'auth'
-    Flaky::AppleScript.beat_security_agent
-    exit
-elsif ARGV && ARGV.length === 3
-  # rake 3 ios files.txt
-  count = ARGV.first
-  os = ARGV[1]
-  file = ARGV.last
-  raise 'File must end in .txt' unless File.extname(ARGV.last).downcase == '.txt'
-  puts "Running select #{os} tests from file #{file} #{count}x"
-  Flaky.run_from_file count: count, os: os, file: file
+  Flaky::AppleScript.beat_security_agent
   exit
+elsif ARGV && ARGV.length === 3
+  if ARGV[0].to_i.kind_of?(Integer) && ARGV[1].to_i.kind_of?(Integer)
+    raise 'First pass must be 1' unless ARGV[0].to_i == 1
+    # flake 1 2 ios
+    pass_1 = ARGV[0] # 1
+    count = ARGV[1] # 2
+    os = ARGV[2] # ios
+    puts "Running all #{os} tests 1x #{count}x"
+    Flaky.two_pass count: count, os: os
+    exit
+  else
+    # rake 3 ios files.txt
+    count = ARGV.first
+    os = ARGV[1]
+    file = ARGV.last
+    raise 'File must end in .txt' unless File.extname(ARGV.last).downcase == '.txt'
+    puts "Running select #{os} tests from file #{file} #{count}x"
+    Flaky.run_from_file count: count, os: os, file: file
+    exit
+  end
+
 else
   unless ARGV && ARGV.length === 2
     puts usage_string
@@ -35,9 +47,6 @@ else
   end
 end
 
-require File.expand_path '../../lib/flaky', __FILE__
-
-
 # flaky 1 ios[test_name]
 
 count = ARGV.first

data/lib/flaky.rb

@@ -9,8 +9,8 @@ require 'posix/spawn' # http://rubygems.org/gems/posix-spawn
 require 'digest/md5'
 
 module Flaky
-  VERSION = '0.0.19' unless defined? ::Flaky::VERSION
-  DATE = '2013-12-23' unless defined? ::Flaky::DATE
+  VERSION = '0.0.20' unless defined? ::Flaky::VERSION
+  DATE = '2013-12-26' unless defined? ::Flaky::DATE
 
   # require internal files
   require_relative 'flaky/appium'
@@ -20,4 +20,5 @@ module Flaky
   require_relative 'flaky/run/all_tests'
   require_relative 'flaky/run/from_file'
   require_relative 'flaky/run/one_test'
+  require_relative 'flaky/run/two_pass'
 end

data/lib/flaky/appium.rb

@@ -68,7 +68,8 @@ module Flaky
 
     def start
       self.stop # stop existing process
-      @log = "/tmp/flaky/tmp_log_#{Random.rand(10**4..10**5-1)}"
+      @log = "/tmp/flaky/tmp_log"
+      File.delete(@log) if File.exists? @log
       if @android
         @droid.reset
       else
@@ -94,19 +95,16 @@ module Flaky
 
     def update_buffer data
       @buffer += data
-
-      if @buffer.length >= 32_000
-        self.flush_buffer
-      end
+      self.flush_buffer
     end
 
     def flush_buffer
-      return '' if @buffer.nil? || @buffer.empty?
+      return @log if @buffer.nil? || @buffer.empty?
       File.open(@log, 'a') do |f|
         f.write @buffer
       end
       @buffer = ''
-      @log || ''
+      @log
     end
 
     ##

data/lib/flaky/run.rb

@@ -38,11 +38,11 @@ module Flaky
     include Flaky::Color
     attr_reader :tests, :result_dir, :result_file
 
-    def initialize
+    def initialize result_dir_postfix=''
       @tests = {}
       @start_time = Time.now
 
-      result_dir = '/tmp/flaky/'
+      result_dir = '/tmp/flaky/' + result_dir_postfix
       # rm -rf result_dir
       FileUtils.rm_rf result_dir
       FileUtils.mkdir_p result_dir
@@ -80,9 +80,14 @@ module Flaky
       out += "Failure (#{total_failure}):\n#{failure}\n" unless failure.empty?
       out += "Success (#{total_success}):\n#{success}" unless success.empty?
 
-      duration = Time.now - @start_time
+      time_now = Time.now
+      duration = time_now - @start_time
       duration = ChronicDuration.output(duration.round) || '0s'
-      out += "\nFinished in #{duration}"
+      out += "\nFinished in #{duration}\n"
+      time_format = '%b %d %l:%M %P'
+      time_format2 = '%l:%M %P'
+      out += "#{@start_time.strftime(time_format)} -#{time_now.strftime(time_format2)}"
+      out += "\n--\n"
 
       if save_file
         File.open(@fail_file, 'w') do |f|
@@ -163,16 +168,12 @@ module Flaky
         # appium server log
         appium_server_path = log_file.name("#{postfix}.appium.html")
         FileUtils.mkdir_p File.dirname(appium_server_path)
-        File.open(appium_server_path, 'w') do |f|
-          # this may return nil
-          tmp_file = appium.flush_buffer
-
-          # todo: copy file instead of read & delete
-          if !tmp_file.nil? && !tmp_file.empty?
-            f.write File.read tmp_file
-            File.delete tmp_file
-          end
+
+        tmp_file = appium.flush_buffer
+        if !tmp_file.nil? && !tmp_file.empty?
+          FileUtils.copy_file tmp_file, appium_server_path
         end
+        File.delete tmp_file if File.exists? tmp_file
       end
 
       passed
@@ -193,7 +194,7 @@ module Flaky
 
       old_crash_files = []
       # appium is nil when on sauce
-      if !sauce && appium && appium.ios
+      if !sauce && appium
         collect_crashes old_crash_files
       end
 
@@ -217,8 +218,9 @@ module Flaky
         print " https://saucelabs.com/tests/#{File.read('/tmp/appium_lib_session').chomp}\n"
       end
 
+      # androids adb may crash also and it ends up in the same location as iOS.
       # appium is nil when running on Sauce
-      if !sauce && appium && appium.ios
+      if !sauce && appium
         new_crash_files = []
         collect_crashes new_crash_files
 
@@ -226,7 +228,7 @@ module Flaky
         if new_crash_files.length > 0
           File.open('/tmp/flaky/crashes.txt', 'a') do |f|
             f.puts '--'
-            f.puts "Test: #{test_name} crashed on iOS:"
+            f.puts "Test: #{test_name} crashed on #{appium.ios ? 'ios' : 'android'}:"
             new_crash_files.each { |crash| f.puts crash }
             f.puts '--'
           end

data/lib/flaky/run/two_pass.rb

@@ -0,0 +1,76 @@
+# encoding: utf-8
+module Flaky
+  def self.two_pass opts={}
+    raise 'Must pass :count and :os' unless opts && opts[:count] && opts[:os]
+
+    count = opts[:count].to_i
+    os = opts[:os]
+
+    raise ':count must be an int' unless count.kind_of?(Integer)
+    raise ':os must be a string' unless os.kind_of?(String)
+
+    count1 = 1
+    count2 = count
+
+    running_on_sauce = ENV['SAUCE_USERNAME'] ? true : false
+    FileUtils.rm_rf '/tmp/flaky'
+    result_dir_postfix = '1' # /tmp/flaky/1
+    flaky = Flaky::Run.new(result_dir_postfix)
+    appium = Appium.new unless running_on_sauce
+
+    current_dir = Dir.pwd
+    raise "Rakefile doesn't exist in #{current_dir}" unless File.exists?(File.join(current_dir, 'Rakefile'))
+
+    # run all tests once
+    Dir.glob(File.join current_dir, 'appium', os, 'specs', '**/*.rb') do |test_file|
+      file = test_file
+      name = File.basename file, '.*'
+
+      raise "#{test_file} does not exist." if file.empty?
+
+      test_name = file.sub(current_dir + '/appium/', '')
+      test_name = File.join(File.dirname(test_name), File.basename(test_name, '.*'))
+
+      count1.times do
+        File.open('/tmp/flaky/current.txt', 'a') { |f| f.puts "Running: #{test_name} on #{os}" }
+        appium.start unless running_on_sauce
+        run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}']"
+        passed = flaky.execute(run_cmd: run_cmd, test_name: test_name, appium: appium, sauce: running_on_sauce)
+        break if passed # move onto the next test after one successful run
+      end
+    end
+
+    appium.stop unless running_on_sauce
+    flaky.report
+
+    # ---
+
+    # now run only the failures count2 times
+    fails = File.read(File.join('/tmp/flaky/', result_dir_postfix, 'fail.txt'))
+
+    result_dir_postfix = '2' # /tmp/flaky/1
+    flaky = Flaky::Run.new(result_dir_postfix)
+    appium = Appium.new unless running_on_sauce
+
+    fails.split("\n").each do |test_file|
+      file = test_file
+      name = File.basename file, '.*'
+
+      raise "#{test_file} does not exist." if file.empty?
+
+      test_name = file.sub(current_dir + '/appium/', '')
+      test_name = File.join(File.dirname(test_name), File.basename(test_name, '.*'))
+
+      count2.times do
+        File.open('/tmp/flaky/current.txt', 'a') { |f| f.puts "Running: #{test_name} on #{os}" }
+        appium.start unless running_on_sauce
+        run_cmd = "cd #{current_dir}; rake #{os.downcase}['#{name}']"
+        passed = flaky.execute run_cmd: run_cmd, test_name: test_name, appium: appium, sauce: running_on_sauce
+        break if passed # move onto the next test after one successful run
+      end
+    end
+
+    appium.stop unless running_on_sauce
+    flaky.report
+  end
+end # module Flaky

data/release_notes.md

@@ -1,3 +1,9 @@
+#### v0.0.19 2013-12-23
+
+- [25630f1](https://github.com/appium/flaky/commit/25630f1d536715db8539c2d96adba15f5b35d5e4) Release 0.0.19
+- [7006405](https://github.com/appium/flaky/commit/70064050daec3d94608063edad94e37a0066d4c5) Save failed test names to fail.txt
+
+
 #### v0.0.18 2013-12-23
 
 - [2843ce6](https://github.com/appium/flaky/commit/2843ce61c0e9dd6f0cebac2e2ab1486044f4ec57) Release 0.0.18

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flaky
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-23 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration
@@ -75,6 +75,7 @@ files:
 - lib/flaky/run/all_tests.rb
 - lib/flaky/run/from_file.rb
 - lib/flaky/run/one_test.rb
+- lib/flaky/run/two_pass.rb
 - readme.md
 - release_notes.md
 - test/all_tests.rb