more tests. load tests fail

Author: jeremydvoss

opentelemetry-instrumentation/tests/test_dependencies.py

@@ -121,7 +121,7 @@ def read_text(self, filename):
             def requires(self):
                 return [
                     'foo ~= 1.0; extra == "instruments_either"',
-                    'bar ~= 1.0; extra == "instruments_either"'
+                    'bar ~= 1.0; extra == "instruments_either"',
                 ]
 
         dist = MockDistribution()
@@ -136,7 +136,6 @@ def version_side_effect(package_name):
 
         version_mock.side_effect = version_side_effect
         conflict = get_dist_dependency_conflicts(dist)
-        print("CONFLICT", conflict)
         self.assertIsNone(conflict)
 
     @patch("opentelemetry.instrumentation.dependencies.version")
@@ -152,7 +151,7 @@ def read_text(self, filename):
             def requires(self):
                 return [
                     'foo ~= 1.0; extra == "instruments_either"',
-                    'bar ~= 1.0; extra == "instruments_either"'
+                    'bar ~= 1.0; extra == "instruments_either"',
                 ]
 
         dist = MockDistribution()
@@ -164,6 +163,120 @@ def requires(self):
         self.assertTrue(isinstance(conflict, DependencyConflict))
         self.assertEqual(
             str(conflict),
-            # TODO: fix tests of either conflict
             '''DependencyConflict: requested any of the following: "['foo~=1.0; extra == "instruments-either"', 'bar~=1.0; extra == "instruments-either"']" but found: "[]"''',
         )
+
+    # Tests when both "and" and "either" dependencies are specified and both pass.
+    @patch("opentelemetry.instrumentation.dependencies.version")
+    def test_get_dist_dependency_conflicts_either_and(self, version_mock):
+        class MockDistribution(Distribution):
+            def locate_file(self, path):
+                pass
+
+            def read_text(self, filename):
+                pass
+
+            @property
+            def requires(self):
+                # This indicates the instrumentation requires (foo and (bar or baz)))
+                return [
+                    'foo ~= 1.0; extra == "instruments"',
+                    'bar ~= 2.0; extra == "instruments_either"',
+                    'baz ~= 3.0; extra == "instruments_either"',
+                ]
+
+        dist = MockDistribution()
+        
+        def version_side_effect(package_name):
+            if package_name == "foo":
+                return "1.2.0"
+            elif package_name == "bar":
+                raise PackageNotFoundError("bar not found")
+            elif package_name == "baz":
+                return "3.7.0"
+            else:
+                raise PackageNotFoundError(f"{package_name} not found")
+        
+        version_mock.side_effect = version_side_effect
+        conflict = get_dist_dependency_conflicts(dist)
+        self.assertIsNone(conflict)
+
+    # Tests when both "and" and "either" dependencies are specified but the "and" dependencies fail to resolve.
+    @patch("opentelemetry.instrumentation.dependencies.version")
+    def test_get_dist_dependency_conflicts_either_and_failed(self, version_mock):
+        class MockDistribution(Distribution):
+            def locate_file(self, path):
+                pass
+
+            def read_text(self, filename):
+                pass
+
+            @property
+            def requires(self):
+                # This indicates the instrumentation requires (foo and (bar or baz)))
+                return [
+                    'foo ~= 1.0; extra == "instruments"',
+                    'bar ~= 2.0; extra == "instruments_either"',
+                    'baz ~= 3.0; extra == "instruments_either"',
+                ]
+
+        dist = MockDistribution()
+        
+        def version_side_effect(package_name):
+            if package_name == "foo":
+                raise PackageNotFoundError("foo not found")
+            elif package_name == "bar":
+                raise PackageNotFoundError("bar not found")
+            elif package_name == "baz":
+                return "3.7.0"
+            else:
+                raise PackageNotFoundError(f"{package_name} not found")
+        
+        version_mock.side_effect = version_side_effect
+        conflict = get_dist_dependency_conflicts(dist)
+        self.assertTrue(conflict is not None)
+        self.assertTrue(isinstance(conflict, DependencyConflict))
+        self.assertEqual(
+            str(conflict),
+            'DependencyConflict: requested: "foo~=1.0; extra == "instruments"" but found: "None"',
+        )
+
+    # Tests when both "and" and "either" dependencies are specified but the "either" dependencies fail to resolve.
+    @patch("opentelemetry.instrumentation.dependencies.version")
+    def test_get_dist_dependency_conflicts_and_either_failed(self, version_mock):
+        class MockDistribution(Distribution):
+            def locate_file(self, path):
+                pass
+
+            def read_text(self, filename):
+                pass
+
+            @property
+            def requires(self):
+                # This indicates the instrumentation requires (foo and (bar or baz)))
+                return [
+                    'foo ~= 1.0; extra == "instruments"',
+                    'bar ~= 2.0; extra == "instruments_either"',
+                    'baz ~= 3.0; extra == "instruments_either"',
+                ]
+
+        dist = MockDistribution()
+        
+        def version_side_effect(package_name):
+            if package_name == "foo":
+                return "1.7.0"
+            elif package_name == "bar":
+                raise PackageNotFoundError("bar not found")
+            elif package_name == "baz":
+                raise PackageNotFoundError("baz not found")
+            else:
+                raise PackageNotFoundError(f"{package_name} not found")
+        
+        version_mock.side_effect = version_side_effect
+        conflict = get_dist_dependency_conflicts(dist)
+        self.assertTrue(conflict is not None)
+        self.assertTrue(isinstance(conflict, DependencyConflict))
+        self.assertEqual(
+            str(conflict),
+            '''DependencyConflict: requested any of the following: "['bar~=2.0; extra == "instruments-either"', 'baz~=3.0; extra == "instruments-either"']" but found: "[]"''',
+        )