diff --git a/etltest/code_executor.py b/etltest/code_executor.py index 42d386d..ab886eb 100644 --- a/etltest/code_executor.py +++ b/etltest/code_executor.py @@ -50,3 +50,4 @@ def execute(self, test_exec): else: self.log.info(file_path) print subprocess.check_output([sys.executable, file_path]) + diff --git a/etltest/test/test_code_executor.py b/etltest/test/test_code_executor.py index 5bb1930..e21128e 100644 --- a/etltest/test/test_code_executor.py +++ b/etltest/test/test_code_executor.py @@ -16,36 +16,39 @@ def setUp(self): self.multi_dir_path = self.setup_twoFiles() def setup_oneFile(self): + #Create a single file for testing purposes. from tempfile import mkdtemp, mkstemp dir_path = mkdtemp() (fh, f_path) = mkstemp(suffix='.py', dir=dir_path) f = os.fdopen(fh, 'w') - f.write("#!/usr/bin/python\n\nimport sys\nsys.exit(1)") + f.write("#!/usr/bin/python\n\nimport sys\nsys.exit(0)") os.chmod(f_path, 0770) f.close() return dir_path def setup_twoFiles(self): + #Create two temporary files for testing purposes. from tempfile import mkdtemp, mkstemp dir_path = mkdtemp() (fh, f_path) = mkstemp(suffix='.py', dir=dir_path) f = os.fdopen(fh, 'w') - f.write("#!/usr/bin/python\n\nimport sys\nsys.exit(1)") + f.write("#!/usr/bin/python\n\nimport sys\nsys.exit(0)") os.chmod(f_path, 0770) f.close() (fh, f_path) = mkstemp(suffix='.py', dir=dir_path) f = os.fdopen(fh, 'w') - f.write("#!/usr/bin/python\n\nimport sys\nsys.exit(1)") + f.write("#!/usr/bin/python\n\nimport sys\nsys.exit(0)") os.chmod(f_path, 0770) f.close() return dir_path def tearDown(self): + #Remove all testing files. from shutil import rmtree rmtree(self.one_dir_path) rmtree(self.multi_dir_path) @@ -64,11 +67,10 @@ def test_execute_multi_test_mode(self): def test_execute_one(self): ce = CodeExecutor(self.one_dir_path) - self.assertEqual(ce.execute(False), 1) + self.assertEqual(ce.execute(False), None) def test_execute_multi(self): ce = CodeExecutor(self.multi_dir_path) - self.assertEqual(ce.execute(False), 1) - + self.assertEqual(ce.execute(False), None)