From c2a8b0c373e8e9194ae9e782550379e207ca1a20 Mon Sep 17 00:00:00 2001 From: Massimiliano Culpo Date: Fri, 28 Dec 2018 17:05:52 +0100 Subject: [PATCH] Revert "tests: run 'test_compiler_add' serially in Python 2 (#10127)" This reverts commit 28fd1baa8648996e08b39c773cb0d38f5a688673. --- lib/spack/spack/test/cmd/test_compiler_cmd.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/spack/spack/test/cmd/test_compiler_cmd.py b/lib/spack/spack/test/cmd/test_compiler_cmd.py index df6a8d5fd60..381ff12ae95 100644 --- a/lib/spack/spack/test/cmd/test_compiler_cmd.py +++ b/lib/spack/spack/test/cmd/test_compiler_cmd.py @@ -3,11 +3,8 @@ # # SPDX-License-Identifier: (Apache-2.0 OR MIT) -import sys - import pytest import llnl.util.filesystem -import llnl.util.multiproc import spack.cmd.compiler import spack.compilers @@ -58,12 +55,7 @@ def test_compiler_remove(self): compilers = spack.compilers.all_compiler_specs() assert spack.spec.CompilerSpec("gcc@4.5.0") not in compilers - def test_compiler_add(self, mock_compiler_dir, monkeypatch): - # 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) - + def test_compiler_add(self, mock_compiler_dir): # Compilers available by default. old_compilers = set(spack.compilers.all_compiler_specs())