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 <tomas@sedovic.cz>

diff --git a/.gitignore b/.gitignore
index 374f5eafe73d399daa31ed3347f541007114ca78..c4910959f59c0176e6bd698fbfb6670dce2fe6ae 100644 (file)
--- 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 817dd0e0675862a94a244f1c565e73fdd9531b1f..7036ca271ce4411b19f7b94955953f102c0a351d 100644 (file)
--- 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 009deec5038ecfbd3b7a57f6094fe85ca85b1fcb..71e8319cd141fe5619b03a0e958c075231a08bf7 100755 (executable)
--- 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
 }