Merge remote-tracking branch 'drebs/feature/2683-move-keymanager-to-leap_client-2' into develop

Conflicts:
	setup.py

1 files changed, 5 insertions, 1 deletions

diff --git a/setup.py b/setup.py
index 2027d3b9..ed793392 100755
--- a/setup.py
+++ b/setup.py
@@ -21,6 +21,11 @@ versioneer.versionfile_build = 'leap/_version.py'
 versioneer.tag_prefix = ''  # tags are like 1.2.0
 versioneer.parentdir_prefix = 'leap_client-'
 
+# The following import avoids the premature unloading of the `util` submodule
+# when running tests, which would cause an error when nose finishes tests and
+# calls the exit function of the multiprocessing module.
+from multiprocessing import util
+
 setup_root = os.path.dirname(__file__)
 sys.path.insert(0, os.path.join(setup_root, "src"))
 
@@ -64,7 +69,6 @@ setup(
     ),
     classifiers=trove_classifiers,
     install_requires=utils.parse_requirements(),
-    # Uncomment when tests are done
     test_suite='nose.collector',
     test_requires=utils.parse_requirements(
         reqfiles=['pkg/requirements-testing.pip']),