提交 9ed14b53 编写于 作者: L Lukáš Doktor

selftests: Move short global variables in-functions

There are bunch of really short, one-time-used variables defined
globally, which is not really necessary, nor easy to follow. Let's just
define those one/two liners directly to where they are used.
Signed-off-by: NLukáš Doktor <ldoktor@redhat.com>
上级 ea6deb1c
...@@ -29,23 +29,6 @@ basedir = os.path.abspath(basedir) ...@@ -29,23 +29,6 @@ basedir = os.path.abspath(basedir)
AVOCADO = os.environ.get("UNITTEST_AVOCADO_CMD", "./scripts/avocado") AVOCADO = os.environ.get("UNITTEST_AVOCADO_CMD", "./scripts/avocado")
PASS_SCRIPT_CONTENTS = """#!/bin/sh
true
"""
PASS_SHELL_CONTENTS = "exit 0"
FAIL_SCRIPT_CONTENTS = """#!/bin/sh
false
"""
FAIL_SHELL_CONTENTS = "exit 1"
HELLO_LIB_CONTENTS = """
def hello():
return 'Hello world'
"""
LOCAL_IMPORT_TEST_CONTENTS = ''' LOCAL_IMPORT_TEST_CONTENTS = '''
from avocado import Test from avocado import Test
from mylib import hello from mylib import hello
...@@ -272,7 +255,7 @@ class RunnerOperationTest(unittest.TestCase): ...@@ -272,7 +255,7 @@ class RunnerOperationTest(unittest.TestCase):
def test_runner_test_with_local_imports(self): def test_runner_test_with_local_imports(self):
mylib = script.TemporaryScript( mylib = script.TemporaryScript(
'mylib.py', 'mylib.py',
HELLO_LIB_CONTENTS, "def hello():\n return 'Hello world'",
'avocado_simpletest_functional') 'avocado_simpletest_functional')
mylib.save() mylib.save()
mytest = script.Script( mytest = script.Script(
...@@ -697,11 +680,11 @@ class RunnerSimpleTest(unittest.TestCase): ...@@ -697,11 +680,11 @@ class RunnerSimpleTest(unittest.TestCase):
self.tmpdir = tempfile.mkdtemp(prefix='avocado_' + __name__) self.tmpdir = tempfile.mkdtemp(prefix='avocado_' + __name__)
self.pass_script = script.TemporaryScript( self.pass_script = script.TemporaryScript(
'ʊʋʉʈɑ ʅʛʌ', 'ʊʋʉʈɑ ʅʛʌ',
PASS_SCRIPT_CONTENTS, "#!/bin/sh\ntrue",
'avocado_simpletest_functional') 'avocado_simpletest_functional')
self.pass_script.save() self.pass_script.save()
self.fail_script = script.TemporaryScript('avocado_fail.sh', self.fail_script = script.TemporaryScript('avocado_fail.sh',
FAIL_SCRIPT_CONTENTS, "#!/bin/sh\nfalse",
'avocado_simpletest_' 'avocado_simpletest_'
'functional') 'functional')
self.fail_script.save() self.fail_script.save()
...@@ -861,12 +844,12 @@ class ExternalRunnerTest(unittest.TestCase): ...@@ -861,12 +844,12 @@ class ExternalRunnerTest(unittest.TestCase):
self.tmpdir = tempfile.mkdtemp(prefix='avocado_' + __name__) self.tmpdir = tempfile.mkdtemp(prefix='avocado_' + __name__)
self.pass_script = script.TemporaryScript( self.pass_script = script.TemporaryScript(
'pass', 'pass',
PASS_SHELL_CONTENTS, "exit 0",
'avocado_externalrunner_functional') 'avocado_externalrunner_functional')
self.pass_script.save() self.pass_script.save()
self.fail_script = script.TemporaryScript( self.fail_script = script.TemporaryScript(
'fail', 'fail',
FAIL_SHELL_CONTENTS, "exit 1",
'avocado_externalrunner_functional') 'avocado_externalrunner_functional')
self.fail_script.save() self.fail_script.save()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册