Revert "tests: run 'test_compiler_add' serially in Python 2 (#10127)"
This reverts commit 28fd1baa86
.
This commit is contained in:
parent
b7619a33c1
commit
c2a8b0c373
@ -3,11 +3,8 @@
|
|||||||
#
|
#
|
||||||
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
# SPDX-License-Identifier: (Apache-2.0 OR MIT)
|
||||||
|
|
||||||
import sys
|
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
import llnl.util.filesystem
|
import llnl.util.filesystem
|
||||||
import llnl.util.multiproc
|
|
||||||
|
|
||||||
import spack.cmd.compiler
|
import spack.cmd.compiler
|
||||||
import spack.compilers
|
import spack.compilers
|
||||||
@ -58,12 +55,7 @@ def test_compiler_remove(self):
|
|||||||
compilers = spack.compilers.all_compiler_specs()
|
compilers = spack.compilers.all_compiler_specs()
|
||||||
assert spack.spec.CompilerSpec("gcc@4.5.0") not in compilers
|
assert spack.spec.CompilerSpec("gcc@4.5.0") not in compilers
|
||||||
|
|
||||||
def test_compiler_add(self, mock_compiler_dir, monkeypatch):
|
def test_compiler_add(self, mock_compiler_dir):
|
||||||
# This test randomly stall on Travis when spawning processes
|
|
||||||
# in Python 2.6 unit tests
|
|
||||||
if sys.version_info < (3, 0, 0):
|
|
||||||
monkeypatch.setattr(llnl.util.multiproc, 'parmap', map)
|
|
||||||
|
|
||||||
# Compilers available by default.
|
# Compilers available by default.
|
||||||
old_compilers = set(spack.compilers.all_compiler_specs())
|
old_compilers = set(spack.compilers.all_compiler_specs())
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user