flaky 0.0.23 → 0.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d47a6d81b834bcde7d9bf32225bb93a07961a0f
-  data.tar.gz: e17bdee7458eb5cd3f8b3610ca2ef33a80a82a12
+  metadata.gz: 6164251eb88190e5da605eb81d846be8960f0fea
+  data.tar.gz: 58b4537320b25d5362d4dbfffc8e22b1c729a3df
 SHA512:
-  metadata.gz: 9a11390a90e848bb18de2adfd0154af6546b61527f341cbeef135ec198251ec745b9ea1be5eef122a16e48c1610bed10c96b3bfbe00cf4bd75afd51c27684b13
-  data.tar.gz: 82e6234ef0789952a1eab8438a9d836f23ec07a0956cae9083812b50533df4cf52a395dd3ff948ba0aeadb89a600391a114b781105bb6ad8bce8309bd75a1af1
+  metadata.gz: 8e8bbe7d253534769f80fe775e4c6ea1a1c2dda773538c008136c9ed4e464a44df4f516ff77cb53ad3f9691dbeb1c7532df54e3ec1ecccffe0514780f9baf828
+  data.tar.gz: 882d1d81b39a10c8b173ad54a3b1bf95d8bfa9de30edaf1ae34da1fe2b3b1e4a05f18e94d52adb6917feb5c4686664b98c6045b9716f71393fb6a46746e25339

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.23' unless defined? ::Flaky::VERSION
-  DATE = '2014-01-08' unless defined? ::Flaky::DATE
+  VERSION = '0.0.24' unless defined? ::Flaky::VERSION
+  DATE = '2014-01-09' unless defined? ::Flaky::DATE
 
   class << self; attr_accessor :no_video; end
   self.no_video = false; # set default value
@@ -18,6 +18,7 @@ module Flaky
   # require internal files
   require_relative 'flaky/appium'
   require_relative 'flaky/applescript'
+  require_relative 'flaky/reset_android'
   require_relative 'flaky/run'
 
   require_relative 'flaky/run/all_tests'

data/lib/flaky/appium.rb

@@ -61,9 +61,7 @@ module Flaky
       @log = ''
       @buffer = ''
       @android = opts.fetch(:android, false)
-      if @android
-        @droid = Flaky::Android.new
-      end
+      @droid = Flaky::Android.new if @android
       @ios = ! @android
     end
 
@@ -71,6 +69,7 @@ module Flaky
       self.stop # stop existing process
       @log = "/tmp/flaky/appium_tmp_log.txt"
       File.delete(@log) if File.exists? @log
+      # must not rely on appium for reset.
       if @android
         @droid.reset
       else

data/lib/flaky/run.rb

@@ -134,6 +134,13 @@ module Flaky
       log = ''
       tmp_ruby_log = '/tmp/flaky/ruby_log_tmp.txt'
       File.delete(tmp_ruby_log) if File.exists? tmp_ruby_log
+
+      flaky_logs_txt = '/tmp/flaky_logs.txt'
+      File.delete flaky_logs_txt if File.exist? flaky_logs_txt
+      tail_cmd = "tail -f -n1 /Users/#{ENV['USER']}/Library/Logs/iOS\\ Simulator/7.0.3/system.log > #{flaky_logs_txt}"
+      tail_cmd = "adb logcat > #{flaky_logs_txt}" if !appium.ios
+
+      tail_system_log = Flaky::Cmd.new tail_cmd
       begin
         ten_minutes = 10 * 60
         timeout ten_minutes do
@@ -170,6 +177,14 @@ module Flaky
         end
       end
 
+      # waitpid may throw if the pid doesn't exist by the time we're ready to wait.
+      begin
+        tail_system_log_pid = tail_system_log.pid
+        Process.kill :SIGKILL, tail_system_log_pid
+        Process::waitpid tail_system_log_pid
+      rescue
+      end
+
       unless timedout
         found_results = log.scan result
         # all result instances must match success

data/lib/flaky/run/all_tests.rb

@@ -11,7 +11,8 @@ module Flaky
 
     running_on_sauce = ENV['SAUCE_USERNAME'] ? true : false
     flaky = Flaky::Run.new
-    appium = Appium.new unless running_on_sauce
+    is_android = os.strip.downcase == 'android'
+    appium = Appium.new(android: is_android) unless running_on_sauce
 
     current_dir = Dir.pwd
     raise "Rakefile doesn't exist in #{current_dir}" unless File.exists?(File.join(current_dir, 'Rakefile'))

data/lib/flaky/run/from_file.rb

@@ -30,11 +30,12 @@ module Flaky
       raise "Missing tests #{missing_tests}"
     end
 
+    raise "Rakefile doesn't exist in #{current_dir}" unless File.exists?(File.join(current_dir, 'Rakefile'))
+
     running_on_sauce = ENV['SAUCE_USERNAME'] ? true : false
     flaky = Flaky::Run.new
-    appium = Appium.new unless running_on_sauce
-
-    raise "Rakefile doesn't exist in #{current_dir}" unless File.exists?(File.join(current_dir, 'Rakefile'))
+    is_android = os.strip.downcase == 'android'
+    appium = Appium.new(android: is_android) unless running_on_sauce
 
     resolved_paths.each do |test_file|
       file = test_file

data/lib/flaky/run/one_test.rb

@@ -16,7 +16,8 @@ module Flaky
 
     running_on_sauce = ENV['SAUCE_USERNAME'] ? true : false
     flaky = Flaky::Run.new
-    appium = Appium.new unless running_on_sauce
+    is_android = os.strip.downcase == 'android'
+    appium = Appium.new(android: is_android) unless running_on_sauce
 
     current_dir = Dir.pwd
 

data/lib/flaky/run/two_pass.rb

@@ -16,7 +16,8 @@ module Flaky
     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
+    is_android = os.strip.downcase == 'android'
+    appium = Appium.new(android: is_android) unless running_on_sauce
 
     current_dir = Dir.pwd
     raise "Rakefile doesn't exist in #{current_dir}" unless File.exists?(File.join(current_dir, 'Rakefile'))

data/release_notes.md

@@ -1,3 +1,11 @@
+#### v0.0.23 2014-01-08
+
+- [2b19619](https://github.com/appium/flaky/commit/2b19619a2f544c0e29592a2eb814276cb61f1266) Release 0.0.23
+- [44b1375](https://github.com/appium/flaky/commit/44b137532aedddcaf3eacb7350e7ce73f7c55aac) Add 10 minute test timeout
+- [cefcfe3](https://github.com/appium/flaky/commit/cefcfe35f439e1939f0f8b1b63ffea3daecb685d) Update readme.md
+- [3335ff0](https://github.com/appium/flaky/commit/3335ff015e9f04183e2bc408025c42785801839d) Fix appium log extension
+
+
 #### v0.0.22 2014-01-03
 
 - [e60803e](https://github.com/appium/flaky/commit/e60803e2e240617f7d7500c0cfc46e919033235d) Release 0.0.22

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flaky
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.24
 platform: ruby
 authors:
 - code@bootstraponline.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-08 00:00:00.000000000 Z
+date: 2014-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic_duration