From 2e59378ab77dce14c72e40b9d224a60935764b71 Mon Sep 17 00:00:00 2001 From: Nicholas Dudfield Date: Wed, 4 Mar 2015 10:13:43 +0700 Subject: [PATCH] Fix AppVeyor: * Detect continuous integration environment via `CI` variable * Use double quotes for build cache path --- appveyor.yml | 2 +- test/robust-transaction-test.js | 4 ++-- test/testutils.js | 4 ++-- test/ticket-test.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 744f2052a1..2366dbab35 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -19,7 +19,7 @@ environment: # At the end of each successful build we cache this directory. It must be less # than 100MB total compressed. cache: - - 'C:\\rippled_deps' + - "C:\\rippled_deps" # This means we'll download a zip of the branch we want, rather than the full # history. diff --git a/test/robust-transaction-test.js b/test/robust-transaction-test.js index e6a95130b5..4bcd8becac 100644 --- a/test/robust-transaction-test.js +++ b/test/robust-transaction-test.js @@ -8,7 +8,7 @@ var Server = require('./server').Server; var testutils = require('./testutils'); var config = testutils.init_config(); -var make_suite = process.env.TRAVIS != null ? suite.skip : suite; +var make_suite = process.env.CI ? suite.skip : suite; make_suite('Robust transaction submission', function() { var $ = { }; @@ -288,7 +288,7 @@ make_suite('Robust transaction submission', function() { if (++ledgers === 3) { callback(); } else { - setTimeout(nextLedger, process.env.TRAVIS ? 400 : 100 ); + setTimeout(nextLedger, process.env.CI ? 400 : 100 ); } }); $.remote.ledger_accept(); diff --git a/test/testutils.js b/test/testutils.js index bfb15163f5..c6b2a8da3e 100644 --- a/test/testutils.js +++ b/test/testutils.js @@ -616,13 +616,13 @@ function verify_owner_counts(remote, counts, callback) { async.every(tests, iterator, callback); }; -var isTravis = Boolean(process.env.TRAVIS); +var isCI = Boolean(process.env.CI); function ledger_wait(remote, tx) { ;(function nextLedger() { remote.once('ledger_closed', function() { if (!tx.finalized) { - setTimeout(nextLedger, isTravis ? 400 : 100); + setTimeout(nextLedger, isCI ? 400 : 100); } }); remote.ledger_accept(); diff --git a/test/ticket-test.js b/test/ticket-test.js index 6326adec4c..d85f820b8e 100644 --- a/test/ticket-test.js +++ b/test/ticket-test.js @@ -9,8 +9,8 @@ var config = testutils.init_config(); /* --------------------------------- CONSTS --------------------------------- */ // some parts of the test take a LONG time -var SKIP_TICKET_EXPIRY_PHASE = process.env.TRAVIS == null && - process.env.RUN_TICKET_EXPIRY == null; +var SKIP_TICKET_EXPIRY_PHASE = !process.env.CI && + !process.env.RUN_TICKET_EXPIRY; var ROOT_ACCOUNT = UInt160.json_rewrite('root'); var ALICE_ACCOUNT = UInt160.json_rewrite('alice');