From e5c5f2d54c10838e439ee58705b6bb6797b94172 Mon Sep 17 00:00:00 2001 From: Dave Eddy Date: Fri, 25 Sep 2015 13:10:39 -0400 Subject: [PATCH] use env profile for integration tests --- lib/cli.js | 5 ++++- test/integration/helpers.js | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/cli.js b/lib/cli.js index 6c52cc4..03c9ca5 100644 --- a/lib/cli.js +++ b/lib/cli.js @@ -215,7 +215,10 @@ CLI.prototype.init = function (opts, args, callback) { }); self.log.trace({config: config}, 'loaded config'); - var profileName = opts.profile || config.profile || 'env'; + var profileName = opts.profile || + config.profile || + process.env.TRITON_PROFILE || + 'env'; var profile = mod_config.loadProfile({ configDir: self.configDir, name: profileName diff --git a/test/integration/helpers.js b/test/integration/helpers.js index 5273305..0e6bbef 100644 --- a/test/integration/helpers.js +++ b/test/integration/helpers.js @@ -75,6 +75,7 @@ function triton(args, cb) { PATH: process.env.PATH, HOME: process.env.HOME, SSH_AUTH_SOCK: process.env.SSH_AUTH_SOCK, + TRITON_PROFILE: 'env', SDC_URL: CONFIG.url, SDC_ACCOUNT: CONFIG.account, SDC_KEY_ID: CONFIG.keyId,