lib/calabash-android/operations.rb in calabash-android-0.9.1.pre1 vs lib/calabash-android/operations.rb in calabash-android-0.9.1.pre2

@@ -388,11 +388,11 @@
         true
       end
 
       def update_app(app_path)
         if _sdk_version >= 23
-          cmd = "#{adb_command} install -rg \"#{app_path}\""
+          cmd = "#{adb_command} install -r -g \"#{app_path}\""
         else
           cmd = "#{adb_command} install -r \"#{app_path}\""
         end
 
         log "Updating: #{app_path}"
@@ -731,12 +731,12 @@
 
         log "Starting test server using:"
         log cmd
         raise "Could not execute command to start test server" unless system("#{cmd} 2>&1")
 
-        Calabash::Android::Retry.retry :tries => 100, :interval => 0.1 do
-          raise "App did not start" unless app_running?
+        Calabash::Android::Retry.retry :tries => 600, :interval => 0.1 do
+          raise "App did not start see adb logcat for details" unless app_running?
         end
 
         begin
           Calabash::Android::Retry.retry :tries => 300, :interval => 0.1 do
             log "Checking if instrumentation backend is ready"
@@ -1117,13 +1117,9 @@
     def swipe(query_string, options={})
       raise 'Swipe not implemented. Use flick or pan instead.'
     end
 
     def cell_swipe(options={})
-      ni
-    end
-
-    def done
       ni
     end
 
     def find_scrollable_view(options={})
       timeout = options[:timeout] || 30