From 559717ead977cf691223fe899b48d2e656c5816d Mon Sep 17 00:00:00 2001 From: Nikita Konovalov Date: Wed, 26 Feb 2014 12:51:33 +0400 Subject: [PATCH] Fix API launch 'node' enviroment does not exist anymore. replaced with 'grunt' Added MySQL driver installation to env script. It is in test-requirements so it will not be installed from a tarball. Change-Id: I2eb2d28f40fb2a8c71cea1df4ebba272d6537ca3 --- bin/api.sh | 2 +- tox.ini | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/api.sh b/bin/api.sh index 78ef35f3..b0d1c7b7 100755 --- a/bin/api.sh +++ b/bin/api.sh @@ -60,7 +60,7 @@ function stop_service() { function detect_storyboard_config() { local global_config_path='/etc/storyboard/storyboard.conf' local test_config_path="$WORKSPACE/bin/storyboard_test.conf" - local config_path="$WORKSPACE/.tox/node/etc/storyboard/storyboard.conf" + local config_path="$WORKSPACE/.tox/grunt/etc/storyboard/storyboard.conf" local source_config_path diff --git a/tox.ini b/tox.ini index 4efa0fb0..38b3b8f9 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,5 @@ [tox] minversion = 1.6 -envlist = node skipsdist = True [testenv] @@ -16,6 +15,7 @@ commands = npm config set ca "" npm install npm -g npm config delete ca + pip install MySQL-python npm install -g bower@1.2.8 grunt@0.4.2 grunt-cli@0.1.11 npm install bower install @@ -26,6 +26,7 @@ commands = npm config set ca "" npm install npm -g npm config delete ca + pip install MySQL-python npm install -g bower@1.2.8 grunt@0.4.2 grunt-cli@0.1.11 npm install bower install @@ -40,6 +41,7 @@ commands = npm config set ca npm install npm -g npm config delete ca + pip install MySQL-python npm install -g bower@1.2.8 grunt@0.4.2 grunt-cli@0.1.11 npm install bower install