From 46fc18a9a965a147bb6249dde1722911cc1d07d7 Mon Sep 17 00:00:00 2001 From: Laszlo Nagy Date: Sat, 28 Jan 2017 22:48:26 +0000 Subject: [scan-build-py] use subprocess wrapper llvm-svn: 293396 --- clang/tools/scan-build-py/tests/unit/test_intercept.py | 12 ++---------- clang/tools/scan-build-py/tests/unit/test_runner.py | 1 - 2 files changed, 2 insertions(+), 11 deletions(-) (limited to 'clang/tools/scan-build-py/tests') diff --git a/clang/tools/scan-build-py/tests/unit/test_intercept.py b/clang/tools/scan-build-py/tests/unit/test_intercept.py index 5b6ed2cee1f..583d1c3da97 100644 --- a/clang/tools/scan-build-py/tests/unit/test_intercept.py +++ b/clang/tools/scan-build-py/tests/unit/test_intercept.py @@ -65,11 +65,10 @@ class InterceptUtilTest(unittest.TestCase): DISABLED = 'disabled' OSX = 'darwin' - LINUX = 'linux' with libear.TemporaryDirectory() as tmpdir: + saved = os.environ['PATH'] try: - saved = os.environ['PATH'] os.environ['PATH'] = tmpdir + ':' + saved create_csrutil(tmpdir, ENABLED) @@ -77,21 +76,14 @@ class InterceptUtilTest(unittest.TestCase): create_csrutil(tmpdir, DISABLED) self.assertFalse(sut.is_preload_disabled(OSX)) - - create_sestatus(tmpdir, ENABLED) - self.assertTrue(sut.is_preload_disabled(LINUX)) - - create_sestatus(tmpdir, DISABLED) - self.assertFalse(sut.is_preload_disabled(LINUX)) finally: os.environ['PATH'] = saved + saved = os.environ['PATH'] try: - saved = os.environ['PATH'] os.environ['PATH'] = '' # shall be false when it's not in the path self.assertFalse(sut.is_preload_disabled(OSX)) - self.assertFalse(sut.is_preload_disabled(LINUX)) self.assertFalse(sut.is_preload_disabled('unix')) finally: diff --git a/clang/tools/scan-build-py/tests/unit/test_runner.py b/clang/tools/scan-build-py/tests/unit/test_runner.py index 2d090622332..4b51e652849 100644 --- a/clang/tools/scan-build-py/tests/unit/test_runner.py +++ b/clang/tools/scan-build-py/tests/unit/test_runner.py @@ -150,7 +150,6 @@ class RunAnalyzerTest(unittest.TestCase): def test_run_analyzer_crash_and_forwarded(self): content = "int div(int n, int d) { return n / d }" (_, fwds) = RunAnalyzerTest.run_analyzer(content, True) - self.assertEqual('crash', fwds['error_type']) self.assertEqual(1, fwds['exit_code']) self.assertTrue(len(fwds['error_output']) > 0) -- cgit v1.2.3