From 2b287c3bce451133ea477d28403eeeb2c01af7b7 Mon Sep 17 00:00:00 2001
From: Vlad Niculae <vlad@vene.ro>
Date: Mon, 7 May 2012 15:00:43 +0300
Subject: [PATCH] FIX: bug in test_setup. Actually avoid multiprocessing now.
---
sklearn/test_setup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sklearn/test_setup.py b/sklearn/test_setup.py
index 5e6e7e833e..a2c13b6798 100644
--- a/sklearn/test_setup.py
+++ b/sklearn/test_setup.py
@@ -6,6 +6,6 @@ their collection scan.
"""
import os
-if os.name.startswith('win'):
+if os.name.startswith('win') or os.name.startswith('nt'):
# During the tests, under Windows, we don't want any multiprocessing
- os.environ['JOBLIB_MULTIPROCESSING'] = 0
+ os.environ['JOBLIB_MULTIPROCESSING'] = '0'
--
GitLab