From 9834da72329b6d2fc7d5db357a3c836e4710cab5 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Sun, 3 Sep 2017 23:02:47 -0400 Subject: plugin.py: Removed special case for test cases Turns out this doesnt work once you try to actually run the full buildstream in a test case (in foreground it screws with other parsing, in background it fails in the test context with a strange error). --- buildstream/plugin.py | 4 +--- setup.cfg | 2 -- setup.py | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/buildstream/plugin.py b/buildstream/plugin.py index ae5f4018f..775215462 100644 --- a/buildstream/plugin.py +++ b/buildstream/plugin.py @@ -526,9 +526,7 @@ class Plugin(): # @contextmanager def _output_file(self): - if 'BST_TEST_SUITE' in os.environ: - yield sys.stdout - elif not self.__log: + if not self.__log: with open(os.devnull, "w") as output: yield output else: diff --git a/setup.cfg b/setup.cfg index 8950a0c1b..e5414a8b0 100644 --- a/setup.cfg +++ b/setup.cfg @@ -12,5 +12,3 @@ pep8ignore = tmp/* ALL */lib/python3* ALL */bin/* ALL -env = - D:BST_TEST_SUITE=True diff --git a/setup.py b/setup.py index a13a06472..f66f76cc3 100755 --- a/setup.py +++ b/setup.py @@ -145,6 +145,5 @@ setup(name='BuildStream', 'pytest-datafiles', 'pytest-pep8', 'pytest-cov', - 'pytest-env', 'pytest'], zip_safe=False) -- cgit v1.2.1