Remove unused variables in tests

This commit removes or marks unused variables as "expected to be unused"
by using '_' prefix.

Reviewed-By: Florence Blanc-Renaud <frenaud@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>

5 files changed, 15 insertions, 15 deletions

diff --git a/ipatests/test_xmlrpc/tracker/automember_plugin.py b/ipatests/test_xmlrpc/tracker/automember_plugin.py
index 61f87c365..151668945 100644
--- a/ipatests/test_xmlrpc/tracker/automember_plugin.py
+++ b/ipatests/test_xmlrpc/tracker/automember_plugin.py
@@ -110,7 +110,7 @@ class AutomemberTracker(Tracker):
             try:
                 self.attrs[u'group'] =\
                     self.attrs[u'group'] + [options[u'group']]
-            except KeyError as ex:
+            except KeyError:
                 self.attrs[u'group'] = [options[u'group']]
             # search for hosts in the target automember and
             # add them as memberindirect hosts
@@ -118,7 +118,7 @@ class AutomemberTracker(Tracker):
             try:
                 self.attrs[u'hostgroup'] =\
                     self.attrs[u'hostgroup'] + [options[u'hostgroup']]
-            except KeyError as ex:
+            except KeyError:
                 self.attrs[u'hostgroup'] = [options[u'hostgroup']]
 
         command = self.make_add_member_command(options)
@@ -135,12 +135,12 @@ class AutomemberTracker(Tracker):
         try:
             if not self.attrs[u'member_host']:
                 del self.attrs[u'member_host']
-        except KeyError as ex:
+        except KeyError:
             pass
         try:
             if not self.attrs[u'member_automember']:
                 del self.attrs[u'member_automember']
-        except KeyError as ex:
+        except KeyError:
             pass
 
         command = self.make_remove_member_command(options)
diff --git a/ipatests/test_xmlrpc/tracker/group_plugin.py b/ipatests/test_xmlrpc/tracker/group_plugin.py
index 94a4cdc8c..5d039d441 100644
--- a/ipatests/test_xmlrpc/tracker/group_plugin.py
+++ b/ipatests/test_xmlrpc/tracker/group_plugin.py
@@ -117,13 +117,13 @@ class GroupTracker(Tracker):
             try:
                 self.attrs[u'member_user'] =\
                     self.attrs[u'member_user'] + [options[u'user']]
-            except KeyError as ex:
+            except KeyError:
                 self.attrs[u'member_user'] = [options[u'user']]
         elif u'group' in options:
             try:
                 self.attrs[u'member_group'] =\
                     self.attrs[u'member_group'] + [options[u'group']]
-            except KeyError as ex:
+            except KeyError:
                 self.attrs[u'member_group'] = [options[u'group']]
 
         command = self.make_add_member_command(options)
@@ -140,12 +140,12 @@ class GroupTracker(Tracker):
         try:
             if not self.attrs[u'member_user']:
                 del self.attrs[u'member_user']
-        except KeyError as ex:
+        except KeyError:
             pass
         try:
             if not self.attrs[u'member_group']:
                 del self.attrs[u'member_group']
-        except KeyError as ex:
+        except KeyError:
             pass
 
         command = self.make_remove_member_command(options)
diff --git a/ipatests/test_xmlrpc/tracker/hostgroup_plugin.py b/ipatests/test_xmlrpc/tracker/hostgroup_plugin.py
index 8b63c90b0..080d0120a 100644
--- a/ipatests/test_xmlrpc/tracker/hostgroup_plugin.py
+++ b/ipatests/test_xmlrpc/tracker/hostgroup_plugin.py
@@ -91,7 +91,7 @@ class HostGroupTracker(Tracker):
             try:
                 self.attrs[u'member_host'] =\
                     self.attrs[u'member_host'] + [options[u'host']]
-            except KeyError as ex:
+            except KeyError:
                 self.attrs[u'member_host'] = [options[u'host']]
             # search for hosts in the target hostgroup and
             # add them as memberindirect hosts
@@ -99,7 +99,7 @@ class HostGroupTracker(Tracker):
             try:
                 self.attrs[u'member_hostgroup'] =\
                     self.attrs[u'member_hostgroup'] + [options[u'hostgroup']]
-            except KeyError as ex:
+            except KeyError:
                 self.attrs[u'member_hostgroup'] = [options[u'hostgroup']]
 
         command = self.make_add_member_command(options)
@@ -116,12 +116,12 @@ class HostGroupTracker(Tracker):
         try:
             if not self.attrs[u'member_host']:
                 del self.attrs[u'member_host']
-        except KeyError as ex:
+        except KeyError:
             pass
         try:
             if not self.attrs[u'member_hostgroup']:
                 del self.attrs[u'member_hostgroup']
-        except KeyError as ex:
+        except KeyError:
             pass
 
         command = self.make_remove_member_command(options)
diff --git a/ipatests/test_xmlrpc/tracker/sudocmdgroup_plugin.py b/ipatests/test_xmlrpc/tracker/sudocmdgroup_plugin.py
index f7440540c..a571974c5 100644
--- a/ipatests/test_xmlrpc/tracker/sudocmdgroup_plugin.py
+++ b/ipatests/test_xmlrpc/tracker/sudocmdgroup_plugin.py
@@ -88,7 +88,7 @@ class SudoCmdGroupTracker(Tracker):
         try:
             self.attrs[u'member_sudocmd'] =\
                 self.attrs[u'member_sudocmd'] + [options[u'sudocmd']]
-        except KeyError as ex:
+        except KeyError:
             self.attrs[u'member_sudocmd'] = [options[u'sudocmd']]
 
         command = self.make_add_member_command(options)
@@ -102,7 +102,7 @@ class SudoCmdGroupTracker(Tracker):
         try:
             if not self.attrs[u'member_sudocmd']:
                 del self.attrs[u'member_sudocmd']
-        except KeyError as ex:
+        except KeyError:
             pass
 
         command = self.make_remove_member_command(options)
diff --git a/ipatests/test_xmlrpc/tracker/user_plugin.py b/ipatests/test_xmlrpc/tracker/user_plugin.py
index 6bc0ce19c..4485fd9b4 100644
--- a/ipatests/test_xmlrpc/tracker/user_plugin.py
+++ b/ipatests/test_xmlrpc/tracker/user_plugin.py
@@ -165,7 +165,7 @@ class UserTracker(KerberosAliasMixin, Tracker):
                         (self.kwargs[key].split('@'))[0].lower(),
                         (self.kwargs[key].split('@'))[1]
                     )]
-                except IndexError as ex:
+                except IndexError:
                     # we can provide just principal part
                     self.attrs[key] = [u'%s@%s' % (
                         (self.kwargs[key].lower(),