Throw exception when pip check failed not because of version conflicts (#230)

Author: liyanhui1228

compatibility_lib/compatibility_lib/configs.py

@@ -28,6 +28,7 @@ def _format_url(repo_name, setuppy_path=''):
     'pip',
     'setuptools',
     'wheel',
+    'virtualenv',
 ]
 
 PKG_LIST = [

compatibility_server/pip_checker.py

@@ -45,6 +45,10 @@
 PIP_ENVIRONMENT_ERROR_PATTERN = re.compile(
     r'not install packages due to an EnvironmentError: (?P<error>.*)')
 
+# Pattern for pip check results of version conflicts
+PIP_CHECK_CONFLICTS_PATTERN = re.compile(
+    r'(.*)has requirement(.*)but you have(.*)')
+
 
 class PipCheckerError(Exception):
     """Pip checker failed in an unexpected way."""
@@ -369,10 +373,17 @@ def _check(self, container: docker.models.containers.Container):
             stdout=True,
             stderr=True,
             raise_on_failure=False)
+
+        has_version_conflicts = PIP_CHECK_CONFLICTS_PATTERN.search(output)
         if returncode:
-            return PipCheckResult(self._packages,
-                                  PipCheckResultType.CHECK_WARNING,
-                                  output)
+            if not has_version_conflicts:
+                raise PipCheckerError(
+                    error_msg="The docker container timed out before executing"
+                              "pip command. Error msg: {}".format(output))
+            else:
+                return PipCheckResult(self._packages,
+                                      PipCheckResultType.CHECK_WARNING,
+                                      output)
         return PipCheckResult(self._packages, PipCheckResultType.SUCCESS)
 
     def _list(self, container: docker.models.containers.Container):

compatibility_server/test_pip_checker.py

@@ -262,7 +262,7 @@ def test_check_warning(self, mock_docker, mock__call_pypi_json_api):
                 pip_command=[
                     self._fake_pip_path,
                     '--check-returncode=1',
-                    '--check-output=bad-check',
+                    '--check-output=package has requirement A, but you have B',
                     '--freeze-output=six==1.2.3\n',
                     '--list-output={}'.format(
                         json.dumps(expected_list_output))
@@ -271,7 +271,7 @@ def test_check_warning(self, mock_docker, mock__call_pypi_json_api):
         expected_check_result = pip_checker.PipCheckResult(
                 packages=['six'],
                 result_type=pip_checker.PipCheckResultType.CHECK_WARNING,
-                result_text='bad-check',
+                result_text='package has requirement A, but you have B',
                 dependency_info=expected_dependency_info)
 
         self.assertEqual(