Spearhead/node-spearhead
Archived
3
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

use env profile for integration tests

Browse Source
This commit is contained in:
Dave Eddy 2015-09-25 13:10:39 -04:00
parent 04c7b638d7
commit e5c5f2d54c
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/cli.js
View File

@ -215,7 +215,10 @@ CLI.prototype.init = function (opts, args, callback) {
}); });
self.log.trace({config: config}, 'loaded config'); 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({ var profile = mod_config.loadProfile({
configDir: self.configDir, configDir: self.configDir,
name: profileName name: profileName

1
test/integration/helpers.js
View File

@ -75,6 +75,7 @@ function triton(args, cb) {
PATH: process.env.PATH, PATH: process.env.PATH,
HOME: process.env.HOME, HOME: process.env.HOME,
SSH_AUTH_SOCK: process.env.SSH_AUTH_SOCK, SSH_AUTH_SOCK: process.env.SSH_AUTH_SOCK,
TRITON_PROFILE: 'env',
SDC_URL: CONFIG.url, SDC_URL: CONFIG.url,
SDC_ACCOUNT: CONFIG.account, SDC_ACCOUNT: CONFIG.account,
SDC_KEY_ID: CONFIG.keyId, SDC_KEY_ID: CONFIG.keyId,