Skip to content
Permalink
Browse files

...

  • Loading branch information
honzajavorek committed Feb 3, 2016
1 parent a3e1546 commit 857dfd9e02f9d41b9cc20dc37b2aa72ff7b0889e
Showing with 9 additions and 9 deletions.
  1. +1 −1 .travis.yml
  2. +8 −8 scripts/test-hook-handlers.coffee
@@ -15,7 +15,7 @@ before_install:
before_script:
- "npm run lint"
script:
# - "npm test"
- "npm test"
- "npm run test:hook-handlers"
after_success:
- "npm run coveralls"
@@ -1,4 +1,4 @@
# Spawns dependant integration builds of hook handlers with current Dredd,
# Spawns dependent integration builds of hook handlers with current Dredd,
# where 'current Dredd' means whatever is currently in its repository under
# the last commit on currently active branch.
#
@@ -198,8 +198,8 @@ abortIfNotTriggered = ->

# We do not want to run integration tests of hook handlers for every node
# version in the matrix. One node version is perfectly enough as
# the dependant builds will be performed on the default version Travis CI
# provides anyway (.travis.yml of dependant repositories usually do not
# the dependent builds will be performed on the default version Travis CI
# provides anyway (.travis.yml of dependent repositories usually do not
# specify node version, they care about Ruby, Python, ... versions).
nodeVersionTestedAsFirst = listTestedNodeVersions()[0]
if process.env.TRAVIS_NODE_VERSION isnt nodeVersionTestedAsFirst
@@ -225,12 +225,12 @@ abortIfNotTriggered = ->
process.exit 0


# Waits for results from dependant builds. Its callback gets results in form
# Waits for results from dependent builds. Its callback gets results in form
# of object where keys are integration branches and values are resulting build
# statuses.
waitForResults = (integrationBranches, callback) ->
# Waiting 2 minutes at the beginning so Travis CI has time to pick up
# dependant builds from GitHub.
# dependent builds from GitHub.
setTimeout ->
polling = {}
integrationBranches.forEach (branch) ->
@@ -260,7 +260,7 @@ buildId = process.env.TRAVIS_BUILD_ID


JOBS.forEach ({name, repo}) ->
integrationBranch = "dependant-build/#{buildId}/#{name}"
integrationBranch = "dependent-build/#{buildId}/#{name}"
integrationBranches.push integrationBranch
console.log "Preparing branch #{integrationBranch}..."

@@ -293,9 +293,9 @@ JOBS.forEach ({name, repo}) ->


# Poll for results and evaluate them.
console.log "Waiting for dependant builds..."
console.log "Waiting for dependent builds..."
waitForResults integrationBranches, (err, results) ->
console.log 'All dependant builds finished!'
console.log 'All dependent builds finished!'

if err
console.error err.message, err

0 comments on commit 857dfd9

Please sign in to comment.
You can’t perform that action at this time.