flaky 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 731535ecad6aee9b747f751cd654a7ad183a13a1
-  data.tar.gz: 892cd6407dcfa844edc09a5b0b601bfaaaed6861
+  metadata.gz: df6cf2366a73e86a75c22f82a20519da80d5caaf
+  data.tar.gz: 8a80ee4a3a491174e8177b66e35645b6defbff24
 SHA512:
-  metadata.gz: 3f2ebac794607daaf52a4281f7b01a6f09273e13853712938698cd7dd630912a6b4334f02ece2d3d2c777b9b24aae7a71aae91c8939dd278afee379527a299ca
-  data.tar.gz: 8ec671c657925c5f6781dc0ef887dc7230e73bfb7efb40588e0ac0b5a21ad9161358625619db09a8870303c377519c4e61003e230f2ae3e817d381619018185c
+  metadata.gz: 87923fe2388c06cc5aee655ef04848296595f7d5f9fcf63404353c15623fd87a759179518eb2fedc69150e607dac65bd92f1d833b5c1139b215c75e4b712259f
+  data.tar.gz: e942862e8c9fa4ce05aa116580858f2be63c3a44f68e12a6c4a0ce72fed5538644bfe9bdb6bd7131c95195bbfe7d1d0fe437188833b3135f7a8f05a9d88988bd

data/bin/flake

@@ -30,10 +30,7 @@ Flaky.no_video = true if ENV['SAUCE_USERNAME'] && ENV['SAUCE_ACCESS_KEY']
 
 puts "Recording Video: #{!Flaky.no_video}"
 
-if args && args.length === 1 && args.first === 'auth'
-  Flaky::AppleScript.beat_security_agent
-  exit
-elsif args && args.length === 3
+if args && args.length === 3
   # .to_i will convert any string to 0 so check using a match regex.
   if args[0].match(/\d+/) && args[1].match(/\d+/)
     raise 'First pass must be 1' unless args[0].to_i == 1

data/lib/flaky.rb

@@ -9,8 +9,11 @@ require 'posix/spawn' # http://rubygems.org/gems/posix-spawn
 require 'digest/md5'
 require 'toml'
 
+require_relative 'trace'
+# Flaky.trace_specs trace: Dir.glob(File.join(__dir__, '**', '*.rb')) # verbose logging
+
 module Flaky
-  VERSION = '0.1.2' unless defined? ::Flaky::VERSION
+  VERSION = '0.1.3' unless defined? ::Flaky::VERSION
   DATE = '2015-04-28' unless defined? ::Flaky::DATE
 
   class << self; attr_accessor :no_video; end
@@ -18,7 +21,7 @@ module Flaky
 
   # require internal files
   require_relative 'flaky/appium'
-  require_relative 'flaky/applescript'
+  require_relative 'flaky/cmd'
   require_relative 'flaky/run'
 
   require_relative 'flaky/run/all_tests'

data/lib/flaky/appium.rb

@@ -1,25 +1,5 @@
 # encoding: utf-8
 module Flaky
-
-  class Cmd
-    attr_reader :pid, :in, :out, :err
-
-    def initialize cmd
-      # redirect err to child's out
-      @pid, @in, @out, @err = POSIX::Spawn::popen4 cmd, {:err => [:child, :out]}
-      @in.close
-    end
-
-    def stop
-      [@in, @out, @err].each { |io| io.close unless io.nil? || io.closed? }
-      begin
-        Process.kill 'KILL', @pid
-        Process.waitpid @pid
-      rescue # no such process
-      end
-    end
-  end
-
   #noinspection RubyResolve
   class Appium
     include POSIX::Spawn
@@ -27,50 +7,25 @@ module Flaky
     @@thread = nil
 
     def self.remove_ios_apps
-      user = ENV['USER']
-      raise 'User must be defined' unless user
-
-      # Must kill iPhone simulator or strange install errors will occur.
-      self.kill_all 'iPhone Simulator'
-
-      app_glob = "/Users/#{user}/Library/Application Support/iPhone Simulator/**/Applications"
-      Dir.glob(app_glob) do |ios_app_folder|
-        FileUtils.rm_rf ios_app_folder
-        root = File.dirname ios_app_folder
-        FileUtils.rm_rf File.join(root, 'Library/TCC')
-        FileUtils.rm_rf File.join(root, 'Library/Caches')
-        FileUtils.rm_rf File.join(root, 'Library/Media')
-      end
+      # nop -- this feature has moved into the appium server
     end
 
     def self.kill_all process_name
-      begin
-        _pid, _in, _out, _err = POSIX::Spawn::popen4('killall', '-9', process_name)
-        raise "Unable to kill #{process_name}" unless _pid
-        _in.close
-        _out.read
-        _err.read
-      rescue Errno::EAGAIN
-      # POSIX::Spawn::popen4 may raise EAGAIN. If it does, retry after a second.
-          sleep 1
-          retry
-      ensure
-        [_in, _out, _err].each { |io| io.close unless io.nil? || io.closed? }
-        Process::waitpid(_pid) if _pid
-      end
+      POSIX::Spawn::Child.new("killall -9 #{process_name}")
     end
 
     # android: true to activate Android mode
     def initialize opts={}
-      @ready = false
+      @ready                = false
       @pid, @in, @out, @err = nil
-      @log = ''
-      @buffer = ''
-      @android = opts.fetch(:android, false)
-      @ios = ! @android
+      @log                  = ''
+      @buffer               = ''
+      @android              = opts.fetch(:android, false)
+      @ios                  = !@android
     end
 
     def start
+      @ready = false
       self.stop # stop existing process
       @log = '/tmp/flaky/appium_tmp_log.txt'
       File.delete(@log) if File.exists? @log
@@ -84,16 +39,17 @@ module Flaky
       end
 
       begin
-        timeout 60 do # timeout in seconds
-          while !self.ready
+        timeout 30 do # timeout in seconds
+          while !@ready
             sleep 0.5
           end
         end
-      rescue Timeout::Error
+      rescue Timeout::Error => ex
         # try again if appium fails to become ready
         # sometimes the simulator never launches.
         # the sim crashes or any number of issues.
-        self.start
+        #self.start
+        raise ex
       end
 
       # -e = -A = include other user's processes
@@ -129,16 +85,23 @@ module Flaky
         raise 'Appium never spawned' if io_array.nil?
 
         ready_for_reading = io_array[0]
-
-        ready_for_reading.each do |stream|
-          begin
-            capture = stream.readpartial 999_999
-            update_buffer(capture) if capture
-            @ready = true if !@ready && capture.include?('Appium REST http interface listener started')
-          rescue EOFError
-            out_err.delete stream
-            stream.close
+        stream            = ready_for_reading[0]
+
+        begin
+          capture = stream.readpartial 999_999
+          if capture
+            # $stdout.puts "#{capture}" # verbose logging
+            update_buffer(capture)
+
+            # info: Appium REST http interface listener started on 0.0.0.0:4723
+            if capture.include?('Appium REST http interface listener started')
+              # $stdout.puts 'Appium server successfully started' # verbose logging
+              @ready = true
+            end
           end
+        rescue EOFError
+          out_err.delete stream
+          stream.close
         end
       end
     end
@@ -157,19 +120,20 @@ module Flaky
 
     # Invoked inside a thread by `self.go`
     def launch
-      self.end_all_nodes
       @ready = false
+      self.end_all_nodes
       appium_home = ENV['APPIUM_HOME']
       raise "ENV['APPIUM_HOME'] must be set!" if appium_home.nil? || appium_home.empty?
       contains_appium = File.exists?(File.join(ENV['APPIUM_HOME'], 'bin', 'appium.js'))
       raise "Appium home `#{appium_home}` doesn't contain bin/appium.js!" unless contains_appium
-      cmd = %Q(cd "#{appium_home}"; node . --log-level debug)
+      cmd                   = %Q(node "#{appium_home}" --log-level debug)
       @pid, @in, @out, @err = popen4 cmd
       @in.close
       self # used to chain `launch.wait`
     end
 
     def stop
+      @ready = false
       # https://github.com/tmm1/pygments.rb/blob/master/lib/pygments/popen.rb
       begin
         Process.kill 'KILL', @pid

data/lib/flaky/cmd.rb

@@ -0,0 +1,20 @@
+module Flaky
+  class Cmd
+    attr_reader :pid, :in, :out, :err
+
+    def initialize cmd
+      # redirect err to child's out
+      @pid, @in, @out, @err = POSIX::Spawn::popen4 cmd, { :err => [:child, :out] }
+      @in.close
+    end
+
+    def stop
+      [@in, @out, @err].each { |io| io.close unless io.nil? || io.closed? }
+      begin
+        Process.kill 'KILL', @pid
+        Process.waitpid @pid
+      rescue # no such process
+      end
+    end
+  end
+end

data/lib/flaky/run/two_pass.rb

@@ -51,7 +51,7 @@ module Flaky
 
     result_dir_postfix = '2' # /tmp/flaky/1
     flaky = Flaky::Run.new(result_dir_postfix)
-    appium = Appium.new unless running_on_sauce
+    appium = Appium.new(android: is_android) unless running_on_sauce
 
     fails.split("\n").each do |test_file|
       file = test_file

data/lib/screen_recording.rb

@@ -10,18 +10,7 @@ module Flaky
     # app_name for example MyApp.app
     #
     def capture_ios_app_log app_name
-      begin
-        app_glob = "/Users/#{ENV['USER']}/Library/Application Support/iPhone Simulator/7.0.3/Applications/*/#{app_name}"
-        app_folder = File.dirname Dir.glob(app_glob).first
-
-        tmp_log_folder = '/tmp/flaky_tmp_log_folder'
-        FileUtils.rm_rf tmp_log_folder if File.exists? tmp_log_folder
-        FileUtils.mkdir_p tmp_log_folder
-
-        log_glob = File.join app_folder, 'Library/Caches/Logs/*'
-        Dir.glob(log_glob).each { |log| FileUtils.cp log, tmp_log_folder }
-      rescue # folder may not exist. or there could be no longs
-      end
+      # nop -- this feature has moved into the appium server
     end
 
     def screen_recording_binary

data/lib/trace.rb

@@ -0,0 +1,48 @@
+
+module Flaky
+  ##
+  # Trace file source to :io (default $stdout)
+  #
+  # spec_opts = {}
+  #
+  # @param :trace [Array<String>] the files to trace
+  # @param :io [IO] io to print to
+  def self.trace_specs spec_opts
+    targets   = []
+    files     = {}
+    last_file = ''
+    last_line = -1
+
+    files_to_trace = spec_opts.fetch(:trace, []);
+    io    = spec_opts.fetch(:io, $stdout)
+    color = spec_opts.fetch(:color, "\e[32m") # ANSI.green default
+    # target only existing readable files
+    files_to_trace.each do |f|
+      if File.exists?(f) && File.readable?(f)
+        targets.push File.expand_path f
+        targets.push File.basename f # sometimes the file is relative
+      end
+    end
+    return if targets.empty?
+
+    set_trace_func(lambda do |event, file, line, id, binding, classname|
+      return unless targets.include?(file)
+
+      # never repeat a line
+      return if file == last_file && line == last_line
+
+      file_sym        = file.intern
+      files[file_sym] = IO.readlines(file) if files[file_sym].nil?
+      lines           = files[file_sym]
+
+      # arrays are 0 indexed and line numbers start at one.
+      io.print color if color # ANSI code
+      io.puts lines[line - 1]
+      io.print "\e[0m" if color # ANSI.clear
+
+      last_file = file
+      last_line = line
+
+    end)
+  end
+end

data/readme.md

@@ -1,4 +1,4 @@
-#### flaky [![Gem Version](https://badge.fury.io/rb/flaky.png)](http://rubygems.org/gems/flaky) [![Dependency Status](https://gemnasium.com/appium/flaky.png)](https://gemnasium.com/appium/flaky)
+#### flaky [![Gem Version](https://badge.fury.io/rb/flaky.svg)](http://rubygems.org/gems/flaky) [![Dependency Status](https://gemnasium.com/appium/flaky.svg)](https://gemnasium.com/appium/flaky)
 
 Run Appium iOS/Android tests on OS X to measure flakiness.
 
@@ -20,23 +20,6 @@ This only works with:
 - iOS iPhone Simulator 6.1 +
 - Unique test file names per platform
 
-#### Security dialogs
-
-Instruments prompts for security authorization when testing on iOS.
-Set the following environment variables in `~/.bash_profile`.
-If you don't know your username, type `whoami` in the Terminal and use that value.
-
-```
-export FLAKY_USER="username"
-export FLAKY_PASSWORD="password"
-```
-
-Ensure that Terminal has been granted permission to control the computer. This is set in Security & Privacy -> Accessibility.
-
-![](doc/accessibility_terminal.jpg)
-
-Run `flake auth` to automatically dismiss security dialogs.
-
 --
 
 #### For each test:
@@ -72,4 +55,3 @@ Run `flake auth` to automatically dismiss security dialogs.
     end
   end
 ```
-

data/release_notes.md

@@ -1,3 +1,12 @@
+#### v0.1.2 2015-04-28
+
+- [8df75d3](https://github.com/appium/flaky/commit/8df75d344c5f963985637c3128bf1173cb34877f) Release 0.1.2
+- [bc3375e](https://github.com/appium/flaky/commit/bc3375e4a8f68d632e09df981590eeeb9532c43f) Update adb test
+- [0c18668](https://github.com/appium/flaky/commit/0c18668ae7c3f394fe4b8544a2b1cbca22904407) Add adb test
+- [171333c](https://github.com/appium/flaky/commit/171333c172d26a3ef2da0165170894a66170cff2) Capture debug logs from appium server
+- [7177da4](https://github.com/appium/flaky/commit/7177da4e14f711710bfec1d53e260dabcd92e3d0) Add flaky.txt support to run/one_test.rb
+
+
 #### v0.1.1 2014-05-19
 
 - [98f3c87](https://github.com/appium/flaky/commit/98f3c87c1caa7c64b1d1da26f43642f4bdef04d1) Release 0.1.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flaky
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - code@bootstraponline.com
@@ -83,7 +83,7 @@ files:
 - lib/BeatSecurityAgent.applescript
 - lib/flaky.rb
 - lib/flaky/appium.rb
-- lib/flaky/applescript.rb
+- lib/flaky/cmd.rb
 - lib/flaky/run.rb
 - lib/flaky/run/all_tests.rb
 - lib/flaky/run/from_file.rb
@@ -91,6 +91,7 @@ files:
 - lib/flaky/run/two_pass.rb
 - lib/screen-recording
 - lib/screen_recording.rb
+- lib/trace.rb
 - readme.md
 - release_notes.md
 - test/adb.rb

data/lib/flaky/applescript.rb

@@ -1,16 +0,0 @@
-# encoding: utf-8
-module Flaky
-  class AppleScript
-    def self.beat_security_agent
-      flaky_password = ENV['FLAKY_PASSWORD']
-      raise 'FLAKY_PASSWORD must be defined' if flaky_password.nil? || flaky_password.empty?
-      flaky_user = ENV['FLAKY_USER']
-      raise 'FLAKY_USER must be defined' if flaky_user.nil? || flaky_user.empty?
-
-      script = File.expand_path('../../BeatSecurityAgent.applescript', __FILE__)
-      osascript = 'osascript'
-      Appium.kill_all osascript
-      Process::waitpid(POSIX::Spawn::spawn("/usr/bin/#{osascript} #{script} #{flaky_user} #{flaky_password}"))
-    end
-  end
-end