From 6e9acd83abc0416978f4e4d4dcc81dfe148de679 Mon Sep 17 00:00:00 2001 From: Tomas Sedovic Date: Wed, 18 Apr 2012 11:29:48 +0200 Subject: [PATCH] Fix the test environment 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 --- .gitignore | 1 + heat/engine/resources.py | 1 - run_tests.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 374f5eafe7..c4910959f5 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ dist heat.egg-info heat/vcsversion.py tags +*.log diff --git a/heat/engine/resources.py b/heat/engine/resources.py index 817dd0e067..7036ca271c 100644 --- a/heat/engine/resources.py +++ b/heat/engine/resources.py @@ -118,7 +118,6 @@ class Resource(object): self.instance_id = inst def state_set(self, new_state, reason="state changed"): - if new_state is self.CREATE_COMPLETE: if new_state is self.CREATE_COMPLETE or \ new_state is self.CREATE_FAILED: try: diff --git a/run_tests.sh b/run_tests.sh index 009deec503..71e8319cd1 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -52,7 +52,7 @@ function run_tests { function run_pep8 { echo "Running pep8 ..." 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 }