From b76562465078df07c000a3c5f6156b62a6d03ded Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Mon, 18 Feb 2019 02:39:36 +0530 Subject: [PATCH 1/2] Add a YAML test case for cascading conflicts --- tests/yaml/install/conflicting_cascading.yml | 39 ++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 tests/yaml/install/conflicting_cascading.yml diff --git a/tests/yaml/install/conflicting_cascading.yml b/tests/yaml/install/conflicting_cascading.yml new file mode 100644 index 00000000000..2be6f7e6d55 --- /dev/null +++ b/tests/yaml/install/conflicting_cascading.yml @@ -0,0 +1,39 @@ +base: + available: + - A 1.0.0; depends B == 1.0.0 + - A 2.0.0; depends B == 2.0.0, C == 1.0.0 + - A 3.0.0; depends B == 3.0.0, C == 2.0.0 + - A 4.0.0; depends B == 4.0.0, C == 3.0.0 + - A 5.0.0; depends B == 5.0.0, C == 4.0.0 + - A 6.0.0; depends B == 6.0.0, C == 5.0.0 + - A 7.0.0; depends B == 7.0.0, C == 6.0.0 + - A 8.0.0; depends B == 8.0.0, C == 7.0.0 + + - B 1.0.0; depends C == 1.0.0 + - B 2.0.0; depends C == 2.0.0 + - B 3.0.0; depends C == 3.0.0 + - B 4.0.0; depends C == 4.0.0 + - B 5.0.0; depends C == 5.0.0 + - B 6.0.0; depends C == 6.0.0 + - B 7.0.0; depends C == 7.0.0 + - B 8.0.0; depends C == 8.0.0 + + - C 1.0.0 + - C 2.0.0 + - C 3.0.0 + - C 4.0.0 + - C 5.0.0 + - C 6.0.0 + - C 7.0.0 + - C 8.0.0 + +cases: +- + request: + - install: A + transaction: + - install: + - A 1.0.0 + - B 1.0.0 + - C 1.0.0 +skip: true From 39e6073c0d470f92ff7e175b78b2e35ac18979e6 Mon Sep 17 00:00:00 2001 From: Pradyun Gedam Date: Mon, 18 Feb 2019 02:36:05 +0530 Subject: [PATCH 2/2] Add a YAML test for complex conflicts This is based on a CocoaPods test case, which is linked to from the relevant file. --- tests/yaml/install/conflicting_complex.yml | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 tests/yaml/install/conflicting_complex.yml diff --git a/tests/yaml/install/conflicting_complex.yml b/tests/yaml/install/conflicting_complex.yml new file mode 100644 index 00000000000..77db4318119 --- /dev/null +++ b/tests/yaml/install/conflicting_complex.yml @@ -0,0 +1,30 @@ +# Based on https://github.com/CocoaPods/Resolver-Integration-Specs/blob/53a8e313/case/complex_conflict.json +base: + available: + - A 1.0.2; depends D >= 0 + - A 1.1.4; depends D >= 0 + - A 1.2.0; depends D >= 0 + - A 1.4.0; depends D >= 0 + - B 0.3.3; depends A > 1.0 + - B 0.3.4; depends A >= 1.5.0 + - B 0.3.5; depends A >= 1.2 + - C 3.2; depends A ~= 1.0 + - C 3.3; depends A ~= 1.0 + - D 0.9.8 + - D 1.3.0; depends X >= 0 + - D 1.4.1; depends X >= 0 + - my_app 1.1.0; depends B == 0.3.5, C ~= 3.2.0 + - my_app 1.2.0; depends B == 0.3.4, C ~= 3.3.0 + - my_app 1.3.0; depends B >= 0, C >= 4.0 +cases: +- + request: + - install: my_app + transaction: + - install: + - A 1.4.0 + - B 0.3.5 + - C 3.2 + - D 0.9.8 + - my_app 1.1.0 +skip: true