Added testing framework. Added files for all needed tests. All tests written for the base action. Had to rename query action as it wouldn't import otherwise.

Author: bishopbm2

actions/query.py actions/generic_query.pyactions/query.py renamed to actions/generic_query.py

@@ -70,17 +70,20 @@ def generate_where_clause(self, sql_table, sql_obj, where_dict):
         overrides.
         Returns Query object
         """
+        return_dict = {}
         for key in where_dict.keys():
+            value = where_dict[key]
             # All column names are reserved. Adding a '_' to the begging of the name
             new_key = "_" + key
 
             # Add WHERE statement to the update object
             sql_obj = sql_obj.where(sql_table.c.get(key) == sqlalchemy.sql.bindparam(new_key))
 
-            # Replace key in dictionary with one that will work
-            where_dict[new_key] = where_dict.pop(key)
+            # Add correct key and value to the new dictionary so it can be returned and
+            # used in the query
+            return_dict[new_key] = value
 
-        return (sql_obj, where_dict)
+        return (sql_obj, return_dict)
 
     def generate_values(self, sql_obj, data_dict):
         """Generate values statement for sql queries with the proper
@@ -138,7 +141,7 @@ def resolve_connection(self, kwargs_dict):
         :returns: a dictionary with the connection parameters (see: CONFIG_CONNECTION_KEYS)
         resolved.
         """
-        connection_name = self.get_del_arg('connection', kwargs_dict)
+        connection_name = self.get_del_arg('connection', kwargs_dict, True)
         config_connection = None
         if connection_name:
             config_connection = self.config['sql'].get(connection_name)

actions/lib/base_action.py

@@ -3,7 +3,7 @@
   runner_type: "python-script"
   description: "Query data from a SQL database"
   enabled: true
-  entry_point: query.py
+  entry_point: generic_query.py
   parameters:
     connection:
       type: string

actions/query.yaml

@@ -1,4 +1,4 @@
 mock>=1.3.0,<2.0
 unittest2>=1.1.0,<2.0
 nose>=1.3.7
-
+sqlalchemy

requirements-tests.txt

@@ -0,0 +1 @@
+---

tests/fixtures/config_blank.yaml

@@ -0,0 +1,18 @@
+---
+sql:
+  base:
+    host: abc
+    username: Administrator
+    password: PassworD!
+    database: test
+    drivername: postgresql
+  full:
+    host: abc
+    username: Administrator
+    password: PassworD!
+    port: 1234
+    database: test
+    drivername: mysql
+  sqlite:
+    database: path/to/test
+    drivername: sqlite

tests/fixtures/config_good.yaml

@@ -0,0 +1,10 @@
+---
+sql:
+  missing-drivername:
+    username: Administrator
+    password: PassworD!
+    database: Test
+  missing-database:
+    server: database.domian.tld
+    password: PassworD!
+    drivername: postgresql

tests/fixtures/config_partial.yaml

@@ -0,0 +1,38 @@
+import yaml
+import json
+import logging
+
+from st2tests.base import BaseActionTestCase
+
+
+class SqlBaseActionTestCase(BaseActionTestCase):
+    __test__ = False
+
+    def setUp(self):
+        super(SqlBaseActionTestCase, self).setUp()
+
+        self._config_good = self.load_yaml('config_good.yaml')
+        self._config_blank = self.load_yaml('config_blank.yaml')
+        self._config_partial = self.load_yaml('config_partial.yaml')
+
+    def tearDown(self):
+        super(SqlBaseActionTestCase, self).tearDown()
+        logging.disable(logging.NOTSET)
+
+    def load_yaml(self, filename):
+        return yaml.safe_load(self.get_fixture_content(filename))
+
+    def load_json(self, filename):
+        return json.loads(self.get_fixture_content(filename))
+
+    @property
+    def config_good(self):
+        return self._config_good
+
+    @property
+    def config_blank(self):
+        return self._config_blank
+
+    @property
+    def config_partial(self):
+        return self._config_partial

tests/sql_base_action_test_case.py

@@ -0,0 +1,22 @@
+from sql_base_action_test_case import SqlBaseActionTestCase
+
+from lib.base_action import BaseAction
+from st2common.runners.base_action import Action
+from delete import SQLDeleteAction
+
+# import mock
+
+__all__ = [
+    'TestActionSQLDeleteAction'
+]
+
+
+class TestActionSQLDeleteAction(SqlBaseActionTestCase):
+    __test__ = True
+    action_cls = SQLDeleteAction
+
+    def test_init(self):
+        action = self.get_action_instance({})
+        self.assertIsInstance(action, SQLDeleteAction)
+        self.assertIsInstance(action, BaseAction)
+        self.assertIsInstance(action, Action)

tests/test_action_delete.py

@@ -0,0 +1,22 @@
+from sql_base_action_test_case import SqlBaseActionTestCase
+
+from lib.base_action import BaseAction
+from st2common.runners.base_action import Action
+from insert import SQLInsertAction
+
+# import mock
+
+__all__ = [
+    'TestActionSQLInsertAction'
+]
+
+
+class TestActionSQLInsertAction(SqlBaseActionTestCase):
+    __test__ = True
+    action_cls = SQLInsertAction
+
+    def test_init(self):
+        action = self.get_action_instance({})
+        self.assertIsInstance(action, SQLInsertAction)
+        self.assertIsInstance(action, BaseAction)
+        self.assertIsInstance(action, Action)