Ignore fewer PEP8/flake8 rules

Reasons:
- code should be pythonicaly clean,
  that is why number of ignored rules should reduced

Changes:
- E125, F811, H102, H103, F201, H23,
  H302, F841, H301, H702, H703 rules are now enabled

Change-Id: Ibf4025162244d3c2f1278b49a76ec1527a729042

1 files changed, 23 insertions, 21 deletions

diff --git a/troveclient/tests/test_users.py b/troveclient/tests/test_users.py
index 01290e2..d8846c0 100644
--- a/troveclient/tests/test_users.py
+++ b/troveclient/tests/test_users.py
@@ -17,8 +17,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from testtools import TestCase
-from mock import Mock
+import testtools
+import mock
 
 from troveclient.v1 import users
 from troveclient import base
@@ -28,11 +28,11 @@ Unit tests for users.py
 """
 
 
-class UserTest(TestCase):
+class UserTest(testtools.TestCase):
     def setUp(self):
         super(UserTest, self).setUp()
         self.orig__init = users.User.__init__
-        users.User.__init__ = Mock(return_value=None)
+        users.User.__init__ = mock.Mock(return_value=None)
         self.user = users.User()
 
     def tearDown(self):
@@ -44,17 +44,17 @@ class UserTest(TestCase):
         self.assertEqual('<User: user-1>', self.user.__repr__())
 
 
-class UsersTest(TestCase):
+class UsersTest(testtools.TestCase):
     def setUp(self):
         super(UsersTest, self).setUp()
         self.orig__init = users.Users.__init__
-        users.Users.__init__ = Mock(return_value=None)
+        users.Users.__init__ = mock.Mock(return_value=None)
         self.users = users.Users()
-        self.users.api = Mock()
-        self.users.api.client = Mock()
+        self.users.api = mock.Mock()
+        self.users.api.client = mock.Mock()
 
         self.orig_base_getid = base.getid
-        base.getid = Mock(return_value="instance1")
+        base.getid = mock.Mock(return_value="instance1")
 
     def tearDown(self):
         super(UsersTest, self).tearDown()
@@ -62,7 +62,7 @@ class UsersTest(TestCase):
         base.getid = self.orig_base_getid
 
     def _get_mock_method(self):
-        self._resp = Mock()
+        self._resp = mock.Mock()
         self._body = None
         self._url = None
 
@@ -71,7 +71,7 @@ class UsersTest(TestCase):
             self._url = url
             return (self._resp, body)
 
-        return Mock(side_effect=side_effect_func)
+        return mock.Mock(side_effect=side_effect_func)
 
     def _build_fake_user(self, name, hostname=None, password=None,
                          databases=None):
@@ -122,23 +122,25 @@ class UsersTest(TestCase):
             return val
 
         key = 'key'
-        body = Mock()
-        body.get = Mock(return_value=[{'href': 'http://test.net/test_file',
-                                       'rel': 'next'}])
-        body.__getitem__ = Mock(return_value=["test-value"])
-
-        resp = Mock()
+        body = mock.Mock()
+        body.get = mock.Mock(
+            return_value=[{'href': 'http://test.net/test_file',
+                           'rel': 'next'}]
+        )
+        body.__getitem__ = mock.Mock(return_value=["test-value"])
+
+        resp = mock.Mock()
         resp.status_code = 200
-        self.users.resource_class = Mock(side_effect=side_effect_func)
-        self.users.api.client.get = Mock(return_value=(resp, body))
+        self.users.resource_class = mock.Mock(side_effect=side_effect_func)
+        self.users.api.client.get = mock.Mock(return_value=(resp, body))
         self.assertEqual(["test-value"], self.users._list('url', key).items)
 
-        self.users.api.client.get = Mock(return_value=(resp, None))
+        self.users.api.client.get = mock.Mock(return_value=(resp, None))
         self.assertRaises(Exception, self.users._list, 'url', None)
 
     def test_list(self):
         def side_effect_func(path, user, limit, marker):
             return path
 
-        self.users._list = Mock(side_effect=side_effect_func)
+        self.users._list = mock.Mock(side_effect=side_effect_func)
         self.assertEqual('/instances/instance1/users', self.users.list(1))