Fix DeprecationWarning: assertDictContainsSubset is deprecated

Replaced with assertLessEqual and remove use of six module.

Author: nzlosh

st2api/tests/unit/controllers/v1/test_actions.py

@@ -26,7 +26,7 @@
 
 import mock
 import unittest
-from six.moves import http_client
+import http.client as http_client
 
 from st2common.persistence.action import Action
 import st2common.validators.api.action as action_validator
@@ -486,7 +486,7 @@ def test_post_no_enable_field(self):
 
         # If enabled field is not provided it should default to True
         data = json.loads(post_resp.body)
-        self.assertDictContainsSubset({"enabled": True}, data)
+        self.assertLessEqual({"enabled": True}.items(), data.items())
 
         self.__do_delete(self.__get_action_id(post_resp))
 
@@ -498,7 +498,7 @@ def test_post_false_enable_field(self):
         self.assertEqual(post_resp.status_int, 201)
 
         data = json.loads(post_resp.body)
-        self.assertDictContainsSubset({"enabled": False}, data)
+        self.assertLessEqual({"enabled": False}.items(), data.items())
 
         self.__do_delete(self.__get_action_id(post_resp))