提交 d00afcad 编写于 作者: C Cleber Rosa

selftests/functional/test_basic.py: remove unused or one-off asignments

Remove variable assigments that are used just once and never actually
used.
Signed-off-by: NCleber Rosa <crosa@redhat.com>
上级 46dc92fd
...@@ -183,7 +183,6 @@ class RunnerOperationTest(unittest.TestCase): ...@@ -183,7 +183,6 @@ class RunnerOperationTest(unittest.TestCase):
cmd = '%s --config %s config --datadir' % (AVOCADO, config_file) cmd = '%s --config %s config --datadir' % (AVOCADO, config_file)
result = process.run(cmd) result = process.run(cmd)
output = result.stdout
expected_rc = exit_codes.AVOCADO_ALL_OK expected_rc = exit_codes.AVOCADO_ALL_OK
self.assertEqual(result.exit_status, expected_rc, self.assertEqual(result.exit_status, expected_rc,
"Avocado did not return rc %d:\n%s" % "Avocado did not return rc %d:\n%s" %
...@@ -429,7 +428,6 @@ class RunnerOperationTest(unittest.TestCase): ...@@ -429,7 +428,6 @@ class RunnerOperationTest(unittest.TestCase):
cmd_line = ('%s run --sysinfo=off --job-results-dir %s ' cmd_line = ('%s run --sysinfo=off --job-results-dir %s '
'--xunit - abort.py' % (AVOCADO, self.tmpdir)) '--xunit - abort.py' % (AVOCADO, self.tmpdir))
result = process.run(cmd_line, ignore_status=True) result = process.run(cmd_line, ignore_status=True)
output = result.stdout
excerpt = 'Test died without reporting the status.' excerpt = 'Test died without reporting the status.'
expected_rc = exit_codes.AVOCADO_TESTS_FAIL expected_rc = exit_codes.AVOCADO_TESTS_FAIL
unexpected_rc = exit_codes.AVOCADO_FAIL unexpected_rc = exit_codes.AVOCADO_FAIL
...@@ -437,41 +435,34 @@ class RunnerOperationTest(unittest.TestCase): ...@@ -437,41 +435,34 @@ class RunnerOperationTest(unittest.TestCase):
"Avocado crashed (rc %d):\n%s" % (unexpected_rc, result)) "Avocado crashed (rc %d):\n%s" % (unexpected_rc, result))
self.assertEqual(result.exit_status, expected_rc, self.assertEqual(result.exit_status, expected_rc,
"Avocado did not return rc %d:\n%s" % (expected_rc, result)) "Avocado did not return rc %d:\n%s" % (expected_rc, result))
self.assertIn(excerpt, output) self.assertIn(excerpt, result.stdout)
def test_silent_output(self): def test_silent_output(self):
cmd_line = ('%s --silent run --sysinfo=off --job-results-dir %s ' cmd_line = ('%s --silent run --sysinfo=off --job-results-dir %s '
'passtest.py' % (AVOCADO, self.tmpdir)) 'passtest.py' % (AVOCADO, self.tmpdir))
result = process.run(cmd_line, ignore_status=True) result = process.run(cmd_line, ignore_status=True)
expected_rc = exit_codes.AVOCADO_ALL_OK self.assertEqual(result.exit_status, exit_codes.AVOCADO_ALL_OK)
expected_output = '' self.assertEqual(result.stdout, '')
self.assertEqual(result.exit_status, expected_rc)
self.assertEqual(result.stdout, expected_output)
def test_empty_args_list(self): def test_empty_args_list(self):
cmd_line = AVOCADO cmd_line = AVOCADO
result = process.run(cmd_line, ignore_status=True) result = process.run(cmd_line, ignore_status=True)
expected_rc = exit_codes.AVOCADO_FAIL self.assertEqual(result.exit_status, exit_codes.AVOCADO_FAIL)
expected_output = 'error: too few arguments' self.assertIn('error: too few arguments', result.stderr)
self.assertEqual(result.exit_status, expected_rc)
self.assertIn(expected_output, result.stderr)
def test_empty_test_list(self): def test_empty_test_list(self):
cmd_line = '%s run --sysinfo=off --job-results-dir %s' % (AVOCADO, cmd_line = '%s run --sysinfo=off --job-results-dir %s' % (AVOCADO,
self.tmpdir) self.tmpdir)
result = process.run(cmd_line, ignore_status=True) result = process.run(cmd_line, ignore_status=True)
expected_rc = exit_codes.AVOCADO_JOB_FAIL self.assertEqual(result.exit_status, exit_codes.AVOCADO_JOB_FAIL)
expected_output = ('No test references provided nor any other ' self.assertIn('No test references provided nor any other arguments '
'arguments resolved into tests') 'resolved into tests', result.stderr)
self.assertEqual(result.exit_status, expected_rc)
self.assertIn(expected_output, result.stderr)
def test_not_found(self): def test_not_found(self):
cmd_line = ('%s run --sysinfo=off --job-results-dir %s sbrubles' cmd_line = ('%s run --sysinfo=off --job-results-dir %s sbrubles'
% (AVOCADO, self.tmpdir)) % (AVOCADO, self.tmpdir))
result = process.run(cmd_line, ignore_status=True) result = process.run(cmd_line, ignore_status=True)
expected_rc = exit_codes.AVOCADO_JOB_FAIL self.assertEqual(result.exit_status, exit_codes.AVOCADO_JOB_FAIL)
self.assertEqual(result.exit_status, expected_rc)
self.assertIn('Unable to resolve reference', result.stderr) self.assertIn('Unable to resolve reference', result.stderr)
self.assertNotIn('Unable to resolve reference', result.stdout) self.assertNotIn('Unable to resolve reference', result.stdout)
...@@ -994,22 +985,20 @@ class PluginsTest(AbsPluginsTest, unittest.TestCase): ...@@ -994,22 +985,20 @@ class PluginsTest(AbsPluginsTest, unittest.TestCase):
def test_list_plugin(self): def test_list_plugin(self):
cmd_line = '%s list' % AVOCADO cmd_line = '%s list' % AVOCADO
result = process.run(cmd_line, ignore_status=True) result = process.run(cmd_line, ignore_status=True)
output = result.stdout
expected_rc = exit_codes.AVOCADO_ALL_OK expected_rc = exit_codes.AVOCADO_ALL_OK
self.assertEqual(result.exit_status, expected_rc, self.assertEqual(result.exit_status, expected_rc,
"Avocado did not return rc %d:\n%s" % "Avocado did not return rc %d:\n%s" %
(expected_rc, result)) (expected_rc, result))
self.assertNotIn('No tests were found on current tests dir', output) self.assertNotIn('No tests were found on current tests dir', result.stdout)
def test_list_error_output(self): def test_list_error_output(self):
cmd_line = '%s list sbrubles' % AVOCADO cmd_line = '%s list sbrubles' % AVOCADO
result = process.run(cmd_line, ignore_status=True) result = process.run(cmd_line, ignore_status=True)
output = result.stderr
expected_rc = exit_codes.AVOCADO_FAIL expected_rc = exit_codes.AVOCADO_FAIL
self.assertEqual(result.exit_status, expected_rc, self.assertEqual(result.exit_status, expected_rc,
"Avocado did not return rc %d:\n%s" % "Avocado did not return rc %d:\n%s" %
(expected_rc, result)) (expected_rc, result))
self.assertIn("Unable to resolve reference", output) self.assertIn("Unable to resolve reference", result.stderr)
def test_list_no_file_loader(self): def test_list_no_file_loader(self):
cmd_line = ("%s list --loaders external --verbose -- " cmd_line = ("%s list --loaders external --verbose -- "
...@@ -1052,33 +1041,30 @@ class PluginsTest(AbsPluginsTest, unittest.TestCase): ...@@ -1052,33 +1041,30 @@ class PluginsTest(AbsPluginsTest, unittest.TestCase):
def test_plugin_list(self): def test_plugin_list(self):
cmd_line = '%s plugins' % AVOCADO cmd_line = '%s plugins' % AVOCADO
result = process.run(cmd_line, ignore_status=True) result = process.run(cmd_line, ignore_status=True)
output = result.stdout
expected_rc = exit_codes.AVOCADO_ALL_OK expected_rc = exit_codes.AVOCADO_ALL_OK
self.assertEqual(result.exit_status, expected_rc, self.assertEqual(result.exit_status, expected_rc,
"Avocado did not return rc %d:\n%s" % "Avocado did not return rc %d:\n%s" %
(expected_rc, result)) (expected_rc, result))
if sys.version_info[:2] >= (2, 7, 0): if sys.version_info[:2] >= (2, 7, 0):
self.assertNotIn('Disabled', output) self.assertNotIn('Disabled', result.stdout)
def test_config_plugin(self): def test_config_plugin(self):
cmd_line = '%s config --paginator off' % AVOCADO cmd_line = '%s config --paginator off' % AVOCADO
result = process.run(cmd_line, ignore_status=True) result = process.run(cmd_line, ignore_status=True)
output = result.stdout
expected_rc = exit_codes.AVOCADO_ALL_OK expected_rc = exit_codes.AVOCADO_ALL_OK
self.assertEqual(result.exit_status, expected_rc, self.assertEqual(result.exit_status, expected_rc,
"Avocado did not return rc %d:\n%s" % "Avocado did not return rc %d:\n%s" %
(expected_rc, result)) (expected_rc, result))
self.assertNotIn('Disabled', output) self.assertNotIn('Disabled', result.stdout)
def test_config_plugin_datadir(self): def test_config_plugin_datadir(self):
cmd_line = '%s config --datadir --paginator off' % AVOCADO cmd_line = '%s config --datadir --paginator off' % AVOCADO
result = process.run(cmd_line, ignore_status=True) result = process.run(cmd_line, ignore_status=True)
output = result.stdout
expected_rc = exit_codes.AVOCADO_ALL_OK expected_rc = exit_codes.AVOCADO_ALL_OK
self.assertEqual(result.exit_status, expected_rc, self.assertEqual(result.exit_status, expected_rc,
"Avocado did not return rc %d:\n%s" % "Avocado did not return rc %d:\n%s" %
(expected_rc, result)) (expected_rc, result))
self.assertNotIn('Disabled', output) self.assertNotIn('Disabled', result.stdout)
def test_disable_plugin(self): def test_disable_plugin(self):
cmd_line = '%s plugins' % AVOCADO cmd_line = '%s plugins' % AVOCADO
...@@ -1167,12 +1153,11 @@ class PluginsTest(AbsPluginsTest, unittest.TestCase): ...@@ -1167,12 +1153,11 @@ class PluginsTest(AbsPluginsTest, unittest.TestCase):
def test_Namespace_object_has_no_attribute(self): def test_Namespace_object_has_no_attribute(self):
cmd_line = '%s plugins' % AVOCADO cmd_line = '%s plugins' % AVOCADO
result = process.run(cmd_line, ignore_status=True) result = process.run(cmd_line, ignore_status=True)
output = result.stderr
expected_rc = exit_codes.AVOCADO_ALL_OK expected_rc = exit_codes.AVOCADO_ALL_OK
self.assertEqual(result.exit_status, expected_rc, self.assertEqual(result.exit_status, expected_rc,
"Avocado did not return rc %d:\n%s" % "Avocado did not return rc %d:\n%s" %
(expected_rc, result)) (expected_rc, result))
self.assertNotIn("'Namespace' object has no attribute", output) self.assertNotIn("'Namespace' object has no attribute", result.stderr)
class ParseXMLError(Exception): class ParseXMLError(Exception):
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册