Merge pull request #60 from vrutkovs/py26

Support python 2.6

Author: vrutkovs

.travis.yml

@@ -3,6 +3,7 @@ sudo: false
 language: python
 
 python:
+ - "2.6"
  - "2.7"
 
 env:
@@ -15,7 +16,7 @@ matrix:
     - env: TESTS="pep8"
 
 before_install:
- - pip install pep8 pyflakes behave PyHamcrest python-coveralls nose --upgrade
+ - pip install pep8 pyflakes importlib behave PyHamcrest python-coveralls nose --upgrade
  - python setup.py -q install
  - git clean -fdx
 

ctf_cli/application.py

@@ -120,21 +120,25 @@ def add_remote(self):
             self.add_remote_step()
 
     def add_remote_feature(self):
-        project = self._cli_conf.get(
-            CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_REMOTE_PROJECT)
-        if project is None:
-            path = "tests/features/"
-        else:
+        path = "tests/features/"
+        try:
+            project = self._cli_conf.get(
+                CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_REMOTE_PROJECT)
+            assert project
             path = "tests/features/" + project
+        except Exception:
+            pass
         self.add_submodule(path)
 
     def add_remote_step(self):
-        project = self._cli_conf.get(
-            CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_REMOTE_PROJECT)
-        if project is None:
-            path = "tests/steps/"
-        else:
+        path = "tests/steps/"
+        try:
+            project = self._cli_conf.get(
+                CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_REMOTE_PROJECT)
+            assert project
             path = "tests/steps/" + project
+        except Exception:
+            pass
         self.add_submodule(path)
 
     def list_remotes(self):

ctf_cli/behave.py

@@ -90,12 +90,14 @@ def __init__(self, working_dir, cli_conf=None):
         self._features_dir = os.path.join(self._working_dir, 'features')
         self._steps_dir = os.path.join(self._working_dir, 'steps')
 
-        tests_conf_path = self._cli_conf.get(CTFCliConfig.GLOBAL_SECTION_NAME,
-                                             CTFCliConfig.CONFIG_TESTS_CONFIG_PATH)
-        if tests_conf_path is None:
-            self._tests_conf_path = self.find_tests_config(self._project_tests_dir)
-        else:
+        self._tests_conf_path = self.find_tests_config(self._project_tests_dir)
+        try:
+            tests_conf_path = self._cli_conf.get(CTFCliConfig.GLOBAL_SECTION_NAME,
+                                                 CTFCliConfig.CONFIG_TESTS_CONFIG_PATH)
+            assert tests_conf_path
             self._tests_conf_path = tests_conf_path
+        except Exception:
+            pass
 
         if self._tests_conf_path is not None:
             # keep the cli_conf object Up-To-Date
@@ -321,17 +323,37 @@ def run(self):
         Run Behave and pass some runtime arguments
         :return:
         """
+        behave_data = None
+        try:
+            behave_data = self._cli_conf_obj.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_BEHAVE_DATA)
+        except Exception:
+            pass
+
+        behave_tags = None
+        try:
+            behave_tags = self._cli_conf_obj.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_BEHAVE_TAGS)
+        except Exception:
+            pass
 
-        behave_data = self._cli_conf_obj.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_BEHAVE_DATA)
-        behave_tags = self._cli_conf_obj.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_BEHAVE_TAGS)
-        junit = self._cli_conf_obj.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_JUNIT)
-        verbose = self._cli_conf_obj.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_VERBOSE)
+        junit = None
+        try:
+            junit = self._cli_conf_obj.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_JUNIT)
+        except Exception:
+            pass
+
+        verbose = None
+        try:
+            verbose = self._cli_conf_obj.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_VERBOSE)
+        except Exception:
+            pass
 
         # configuration file for ansible
-        if self._cli_conf_obj.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_EXEC_TYPE) == 'ansible':
-            ansible_conf = self._working_dir_obj.exec_type_conf_path()
-        else:
-            ansible_conf = None
+        ansible_conf = None
+        try:
+            if self._cli_conf_obj.get(CTFCliConfig.GLOBAL_SECTION_NAME, CTFCliConfig.CONFIG_EXEC_TYPE) == 'ansible':
+                ansible_conf = self._working_dir_obj.exec_type_conf_path()
+        except Exception:
+            pass
 
         command = [
             'behave'