openstack/heat
Code Issues Proposed changes

Fix the test environment

Browse Source 
Made sure that `run_tests.sh` works properly (it was failing on the heat/bin
directory) and that all tests pass and the generated logs are .gitignored.

Signed-off-by: Tomas Sedovic <tomas@sedovic.cz>
This commit is contained in:
Tomas Sedovic 2012-04-18 11:29:48 +02:00
parent eac075e5e1
commit 6e9acd83ab
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@ dist
heat.egg-info heat.egg-info
heat/vcsversion.py heat/vcsversion.py
tags tags
*.log

1
heat/engine/resources.py
View File

@ -118,7 +118,6 @@ class Resource(object):
self.instance_id = inst self.instance_id = inst
def state_set(self, new_state, reason="state changed"): def state_set(self, new_state, reason="state changed"):
if new_state is self.CREATE_COMPLETE:
if new_state is self.CREATE_COMPLETE or \ if new_state is self.CREATE_COMPLETE or \
new_state is self.CREATE_FAILED: new_state is self.CREATE_FAILED:
try: try:

2
run_tests.sh
View File

@ -52,7 +52,7 @@ function run_tests {
function run_pep8 { function run_pep8 {
echo "Running pep8 ..." echo "Running pep8 ..."
PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --repeat" PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --repeat"
PEP8_INCLUDE="bin/*.py heat tools setup.py run_tests.py" PEP8_INCLUDE="bin/heat bin/heat-api bin/heat-engine heat tools setup.py run_tests.py"
${wrapper} pep8 $PEP8_OPTIONS $PEP8_INCLUDE ${wrapper} pep8 $PEP8_OPTIONS $PEP8_INCLUDE
} }