Fix failing unittests due to cext not available on windows

isrgomez · isrgomez · commit e609fad66234 · 2018-06-22T17:06:07.000-05:00
The unittest that requires c extensions fails on Windows
due to the missing dll libraries not being copied to the
build/lib folder.

This patch uses the --install-data option form the install
command to indicate where this files should be copied.
diff --git a/lib/cpy_distutils.py b/lib/cpy_distutils.py
@@ -74,6 +74,8 @@
 INSTALL_OPTIONS = [
     ('byte-code-only=', None,
      "Remove Python .py files; leave byte code .pyc only"),
+    ('is-wheel', None,
+     "Install beehaves as wheel package requires"),
 ]
 
 
@@ -330,6 +332,7 @@ def _copy_vendor_libraries(self):
         if not self.with_mysql_capi or not is_wheel:
             return
 
+        log.info("Copying vendor files (dll libraries)")
         data_files = []
         vendor_libs = []
 
@@ -890,7 +893,7 @@ class Install(install):
     user_options = install.user_options + CEXT_OPTIONS + INSTALL_OPTIONS + \
                    CEXT_STATIC_OPTIONS
 
-    boolean_options = ['byte-code-only', 'static']
+    boolean_options = ['byte-code-only', 'static', 'is-wheel']
     need_ext = False
 
     def initialize_options(self):
diff --git a/tests/__init__.py b/tests/__init__.py
@@ -42,6 +42,7 @@
 import subprocess
 import errno
 import traceback
+from distutils.dist import Distribution
 from imp import load_source
 from functools import wraps
 from pkgutil import walk_packages
@@ -825,12 +826,21 @@ def install_connector(root_dir, install_dir, protobuf_include_dir,
         'clean', '--all',  # necessary for removing the build/
     ]
 
+    dist = Distribution()
+    cmd_build = dist.get_command_obj('build')
+    cmd_build.ensure_finalized()
+
     cmd.extend([
         'install',
         '--root', install_dir,
         '--install-lib', '.',
         '--static',
+        '--is-wheel'
     ])
+    if os.name == 'nt':
+        cmd.extend([
+            '--install-data', cmd_build.build_platlib
+        ])
 
     if any((protobuf_include_dir, protobuf_lib_dir, protoc)):
         cmd.extend([
@@ -848,6 +858,7 @@ def install_connector(root_dir, install_dir, protobuf_include_dir,
     if extra_link_args:
         cmd.extend(['--extra-link-args', extra_link_args])
 
+    LOGGER.debug("Installing command: {0}".format(cmd))
     prc = subprocess.Popen(cmd, stdin=subprocess.PIPE,
                            stderr=subprocess.STDOUT, stdout=subprocess.PIPE,
                            cwd=root_dir)
