Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Wait update #139

Merged
merged 26 commits into from
Mar 18, 2015
Merged

Wait update #139

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
fb3ca40
adding wait class to test report downloads during nightly build
Feb 11, 2015
db2148f
adding a few inline comments for documentation.
Feb 11, 2015
ac8f6fe
documentation for default timeout and polling interval times.
Feb 11, 2015
c62f9cf
more documentation
sgreen-r7 Feb 11, 2015
d701790
initial workings for integration method
sgreen-r7 Feb 11, 2015
f64e03e
temp fix to allow tests to run on ruby 2.0
sgreen-r7 Feb 11, 2015
ad8f7f6
merge with rapid7 master
sgreen-r7 Feb 17, 2015
5eba755
setup to use retry_count for timeout failures.
sgreen-r7 Feb 17, 2015
255d03d
rescuse more errors for better error output on failures.
sgreen-r7 Feb 24, 2015
8ff292d
text update for api error output
sgreen-r7 Feb 24, 2015
f771ea8
adding for_judgement method which will accept any proc and poll for i…
sgreen-r7 Feb 26, 2015
f01b4a3
mild cleanup while looking for feedback
sgreen-r7 Feb 26, 2015
639f54d
merge from rapid7/nexpose-client master
sgreen-r7 Feb 26, 2015
c6fcd8e
remove retry_count nil check, and just convert to_i
sgreen-r7 Feb 27, 2015
900ad76
keyword name update for wait argument
sgreen-r7 Feb 27, 2015
39187ef
removing all begin/ends which are not needed
sgreen-r7 Feb 27, 2015
9182ccd
removing un-needed return.
sgreen-r7 Feb 28, 2015
d6d7d32
renamed ready method, updated nsc keyword to nexpose_connection, rena…
sgreen-r7 Feb 28, 2015
392dee3
up max lines to 120 for hound ci.
sgreen-r7 Feb 28, 2015
625c4ee
removing whitespace
sgreen-r7 Feb 28, 2015
478e01e
misc style cleanup
sgreen-r7 Feb 28, 2015
d3806b7
merge from rapid7 master
sgreen-r7 Mar 3, 2015
edf0bba
remove indent from methods in private
sgreen-r7 Mar 4, 2015
a24792f
remove space from after module definition
sgreen-r7 Mar 4, 2015
15a6138
merge from fork into maint/deprecate_ruby_19
sgreen-r7 Mar 11, 2015
846c5eb
remove compatibility for ruby2.0 syntax of keyword arguments.
sgreen-r7 Mar 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
keyword name update for wait argument
  • Loading branch information
@sgreen-r7
sgreen-r7 committed Feb 27, 2015
commit 900ad764f3eec3984e96d0e80b571464bdd5e003
4 changes: 2 additions & 2 deletions lib/nexpose/wait.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ def initialize(timeout: nil, polling_interval: nil)
end


def wait(cond)
def wait(condition)
@poll_begin = Time.now
loop do
break if cond.call
break if condition.call
raise TimeoutError if @poll_begin + @timeout < Time.now
sleep @polling_interval
end
Expand Down