From 9d83be3647547cfca4e129cfeb63771213232cf7 Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Mon, 26 Sep 2016 18:22:22 +0200 Subject: 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 Reviewed-By: Stanislav Laznicka --- ipatests/test_integration/env_config.py | 2 +- ipatests/test_integration/test_testconfig.py | 2 +- ipatests/test_integration/test_topology.py | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'ipatests/test_integration') diff --git a/ipatests/test_integration/env_config.py b/ipatests/test_integration/env_config.py index 3596b6fd4..6e3770fbb 100644 --- a/ipatests/test_integration/env_config.py +++ b/ipatests/test_integration/env_config.py @@ -279,7 +279,7 @@ def domain_from_env(env, config, index, domain_type): env_suffix = '_env%s' % index master_env = '%s%s' % (master_role, env_suffix) - hostname, dot, domain_name = env[master_env].partition('.') + hostname, _dot, domain_name = env[master_env].partition('.') domain = Domain(config, domain_name, domain_type) for role in _roles_from_env(domain, env, env_suffix): diff --git a/ipatests/test_integration/test_testconfig.py b/ipatests/test_integration/test_testconfig.py index 3b08bf217..6146d0d84 100644 --- a/ipatests/test_integration/test_testconfig.py +++ b/ipatests/test_integration/test_testconfig.py @@ -420,7 +420,7 @@ class TestComplexConfig(CheckConfig): def check_config(self, conf): assert len(conf.domains) == 3 main_dom = conf.domains[0] - (client1, client2, extra, extram1, extram2, master, + (client1, client2, extra, extram1, extram2, _master, replica1, replica2) = sorted(main_dom.hosts, key=lambda h: h.role) assert main_dom.name == 'ipadomain.test' assert main_dom.type == 'IPA' diff --git a/ipatests/test_integration/test_topology.py b/ipatests/test_integration/test_topology.py index 4cdcd46a1..c095812c4 100644 --- a/ipatests/test_integration/test_topology.py +++ b/ipatests/test_integration/test_topology.py @@ -188,9 +188,8 @@ class TestTopologyOptions(IntegrationTest): returncode, error = tasks.destroy_segment(self.master, "%s-to-%s" % replicas) assert returncode != 0, error1 assert error.count(text) == 1, error2 % error - newseg, err = tasks.create_segment(self.master, - self.master, - self.replicas[1]) + _newseg, err = tasks.create_segment( + self.master, self.master, self.replicas[1]) assert err == "", err returncode, error = tasks.destroy_segment(self.master, "%s-to-%s" % replicas) assert returncode == 0, error -- cgit