From c5c6dc2c766b2e5a017cb9a0ed5418de407c0d34 Mon Sep 17 00:00:00 2001
From: Vineet Naik <naikvin@gmail.com>
Date: Sun, 20 Dec 2020 22:44:00 +0530
Subject: [PATCH] Fix e2e-tests

The pip version for 'conflicting' profile is pinned to version 20.2.3
ie. before the new resolver that prevents conflicts.
---
 tests/e2e-tests                        |  6 ++++++
 tests/profiles/conflicting/default.out |  4 ++--
 tests/profiles/conflicting/reverse.out |  4 ++--
 tests/profiles/cyclic/default.out      |  6 +++---
 tests/profiles/webapp/all_flag.out     | 22 +++++++++++-----------
 tests/profiles/webapp/default.out      | 12 ++++++------
 tests/profiles/webapp/packages_opt.out |  8 ++++----
 tests/profiles/webapp/reverse.out      | 12 ++++++------
 8 files changed, 40 insertions(+), 34 deletions(-)

diff --git a/tests/e2e-tests b/tests/e2e-tests
index ba49562..3d4ff03 100755
--- a/tests/e2e-tests
+++ b/tests/e2e-tests
@@ -6,6 +6,10 @@ PROFILE=$1
 PYTHON_EXE=${PYTHON_EXE:-python3.6}
 PIP_VERSION=${PIP_VERSION:-latest}
 
+if [ "$PROFILE" == "conflicting" ]; then
+    PIP_VERSION=20.2.3
+fi
+
 cd profiles/$PROFILE
 
 echo "Profile dir: $(pwd)"
@@ -22,6 +26,8 @@ pip=$env_dir/bin/pip
 
 if [ "$PIP_VERSION" == "latest" ]; then
     $pip install -U pip
+else
+    $pip install pip==$PIP_VERSION
 fi
 
 # Install requirements
diff --git a/tests/profiles/conflicting/default.out b/tests/profiles/conflicting/default.out
index 0d7ffff..b70118f 100644
--- a/tests/profiles/conflicting/default.out
+++ b/tests/profiles/conflicting/default.out
@@ -5,5 +5,5 @@ Flask==0.10.1
   - Werkzeug [required: >=0.7, installed: 0.11.2]
 pipdeptree==2.0.0b1
   - pip [required: >=6.0.0, installed: 20.2.3]
-setuptools==50.3.0
-wheel==0.35.1
+setuptools==51.0.0
+wheel==0.36.2
diff --git a/tests/profiles/conflicting/reverse.out b/tests/profiles/conflicting/reverse.out
index 5dd7feb..2f87db2 100644
--- a/tests/profiles/conflicting/reverse.out
+++ b/tests/profiles/conflicting/reverse.out
@@ -5,7 +5,7 @@ MarkupSafe==0.22
     - Flask==0.10.1 [requires: Jinja2>=2.4]
 pip==20.2.3
   - pipdeptree==2.0.0b1 [requires: pip>=6.0.0]
-setuptools==50.3.0
+setuptools==51.0.0
 Werkzeug==0.11.2
   - Flask==0.10.1 [requires: Werkzeug>=0.7]
-wheel==0.35.1
+wheel==0.36.2
diff --git a/tests/profiles/cyclic/default.out b/tests/profiles/cyclic/default.out
index e6f6b44..5f64d32 100644
--- a/tests/profiles/cyclic/default.out
+++ b/tests/profiles/cyclic/default.out
@@ -1,4 +1,4 @@
 pipdeptree==2.0.0b1
-  - pip [required: >=6.0.0, installed: 20.2.3]
-setuptools==50.3.0
-wheel==0.35.1
+  - pip [required: >=6.0.0, installed: 20.3.3]
+setuptools==51.0.0
+wheel==0.36.2
diff --git a/tests/profiles/webapp/all_flag.out b/tests/profiles/webapp/all_flag.out
index b73dfe1..8b109c8 100644
--- a/tests/profiles/webapp/all_flag.out
+++ b/tests/profiles/webapp/all_flag.out
@@ -1,4 +1,4 @@
-appnope==0.1.0
+appnope==0.1.2
 backcall==0.2.0
 click==7.1.2
 decorator==4.4.2
@@ -17,7 +17,7 @@ Flask-Script==2.0.6
     - Werkzeug [required: >=0.15, installed: 1.0.1]
 gnureadline==8.0.0
 ipython==7.13.0
-  - appnope [required: Any, installed: 0.1.0]
+  - appnope [required: Any, installed: 0.1.2]
   - backcall [required: Any, installed: 0.2.0]
   - decorator [required: Any, installed: 4.4.2]
   - jedi [required: >=0.10, installed: 0.17.2]
@@ -25,10 +25,10 @@ ipython==7.13.0
   - pexpect [required: Any, installed: 4.8.0]
     - ptyprocess [required: >=0.5, installed: 0.6.0]
   - pickleshare [required: Any, installed: 0.7.5]
-  - prompt-toolkit [required: >=2.0.0,<3.1.0,!=3.0.1,!=3.0.0, installed: 3.0.7]
+  - prompt-toolkit [required: >=2.0.0,<3.1.0,!=3.0.1,!=3.0.0, installed: 3.0.8]
     - wcwidth [required: Any, installed: 0.2.5]
-  - pygments [required: Any, installed: 2.7.1]
-  - setuptools [required: >=18.5, installed: 50.3.0]
+  - pygments [required: Any, installed: 2.7.3]
+  - setuptools [required: >=18.5, installed: 51.0.0]
   - traitlets [required: >=4.2, installed: 4.3.3]
     - decorator [required: Any, installed: 4.4.2]
     - ipython-genutils [required: Any, installed: 0.2.0]
@@ -44,16 +44,16 @@ parso==0.7.1
 pexpect==4.8.0
   - ptyprocess [required: >=0.5, installed: 0.6.0]
 pickleshare==0.7.5
-pip==20.2.3
+pip==20.3.3
 pipdeptree==2.0.0b1
-  - pip [required: >=6.0.0, installed: 20.2.3]
-prompt-toolkit==3.0.7
+  - pip [required: >=6.0.0, installed: 20.3.3]
+prompt-toolkit==3.0.8
   - wcwidth [required: Any, installed: 0.2.5]
 ptyprocess==0.6.0
-Pygments==2.7.1
+Pygments==2.7.3
 pymongo==3.10.1
 redis==3.4.1
-setuptools==50.3.0
+setuptools==51.0.0
 six==1.15.0
 slugify==0.0.1
 traitlets==4.3.3
@@ -62,4 +62,4 @@ traitlets==4.3.3
   - six [required: Any, installed: 1.15.0]
 wcwidth==0.2.5
 Werkzeug==1.0.1
-wheel==0.35.1
+wheel==0.36.2
diff --git a/tests/profiles/webapp/default.out b/tests/profiles/webapp/default.out
index 8fb50fc..8c9b3ad 100644
--- a/tests/profiles/webapp/default.out
+++ b/tests/profiles/webapp/default.out
@@ -7,7 +7,7 @@ Flask-Script==2.0.6
     - Werkzeug [required: >=0.15, installed: 1.0.1]
 gnureadline==8.0.0
 ipython==7.13.0
-  - appnope [required: Any, installed: 0.1.0]
+  - appnope [required: Any, installed: 0.1.2]
   - backcall [required: Any, installed: 0.2.0]
   - decorator [required: Any, installed: 4.4.2]
   - jedi [required: >=0.10, installed: 0.17.2]
@@ -15,17 +15,17 @@ ipython==7.13.0
   - pexpect [required: Any, installed: 4.8.0]
     - ptyprocess [required: >=0.5, installed: 0.6.0]
   - pickleshare [required: Any, installed: 0.7.5]
-  - prompt-toolkit [required: >=2.0.0,<3.1.0,!=3.0.1,!=3.0.0, installed: 3.0.7]
+  - prompt-toolkit [required: >=2.0.0,<3.1.0,!=3.0.1,!=3.0.0, installed: 3.0.8]
     - wcwidth [required: Any, installed: 0.2.5]
-  - pygments [required: Any, installed: 2.7.1]
-  - setuptools [required: >=18.5, installed: 50.3.0]
+  - pygments [required: Any, installed: 2.7.3]
+  - setuptools [required: >=18.5, installed: 51.0.0]
   - traitlets [required: >=4.2, installed: 4.3.3]
     - decorator [required: Any, installed: 4.4.2]
     - ipython-genutils [required: Any, installed: 0.2.0]
     - six [required: Any, installed: 1.15.0]
 pipdeptree==2.0.0b1
-  - pip [required: >=6.0.0, installed: 20.2.3]
+  - pip [required: >=6.0.0, installed: 20.3.3]
 pymongo==3.10.1
 redis==3.4.1
 slugify==0.0.1
-wheel==0.35.1
+wheel==0.36.2
diff --git a/tests/profiles/webapp/packages_opt.out b/tests/profiles/webapp/packages_opt.out
index abc3e0e..ee24339 100644
--- a/tests/profiles/webapp/packages_opt.out
+++ b/tests/profiles/webapp/packages_opt.out
@@ -1,5 +1,5 @@
 ipython==7.13.0
-  - appnope [required: Any, installed: 0.1.0]
+  - appnope [required: Any, installed: 0.1.2]
   - backcall [required: Any, installed: 0.2.0]
   - decorator [required: Any, installed: 4.4.2]
   - jedi [required: >=0.10, installed: 0.17.2]
@@ -7,10 +7,10 @@ ipython==7.13.0
   - pexpect [required: Any, installed: 4.8.0]
     - ptyprocess [required: >=0.5, installed: 0.6.0]
   - pickleshare [required: Any, installed: 0.7.5]
-  - prompt-toolkit [required: >=2.0.0,<3.1.0,!=3.0.1,!=3.0.0, installed: 3.0.7]
+  - prompt-toolkit [required: >=2.0.0,<3.1.0,!=3.0.1,!=3.0.0, installed: 3.0.8]
     - wcwidth [required: Any, installed: 0.2.5]
-  - pygments [required: Any, installed: 2.7.1]
-  - setuptools [required: >=18.5, installed: 50.3.0]
+  - pygments [required: Any, installed: 2.7.3]
+  - setuptools [required: >=18.5, installed: 51.0.0]
   - traitlets [required: >=4.2, installed: 4.3.3]
     - decorator [required: Any, installed: 4.4.2]
     - ipython-genutils [required: Any, installed: 0.2.0]
diff --git a/tests/profiles/webapp/reverse.out b/tests/profiles/webapp/reverse.out
index 8a53ccb..1fae417 100644
--- a/tests/profiles/webapp/reverse.out
+++ b/tests/profiles/webapp/reverse.out
@@ -1,4 +1,4 @@
-appnope==0.1.0
+appnope==0.1.2
   - ipython==7.13.0 [requires: appnope]
 backcall==0.2.0
   - ipython==7.13.0 [requires: backcall]
@@ -25,25 +25,25 @@ parso==0.7.1
     - ipython==7.13.0 [requires: jedi>=0.10]
 pickleshare==0.7.5
   - ipython==7.13.0 [requires: pickleshare]
-pip==20.2.3
+pip==20.3.3
   - pipdeptree==2.0.0b1 [requires: pip>=6.0.0]
 ptyprocess==0.6.0
   - pexpect==4.8.0 [requires: ptyprocess>=0.5]
     - ipython==7.13.0 [requires: pexpect]
-pygments==2.7.1
+pygments==2.7.3
   - ipython==7.13.0 [requires: pygments]
 pymongo==3.10.1
 redis==3.4.1
-setuptools==50.3.0
+setuptools==51.0.0
   - ipython==7.13.0 [requires: setuptools>=18.5]
 six==1.15.0
   - traitlets==4.3.3 [requires: six]
     - ipython==7.13.0 [requires: traitlets>=4.2]
 slugify==0.0.1
 wcwidth==0.2.5
-  - prompt-toolkit==3.0.7 [requires: wcwidth]
+  - prompt-toolkit==3.0.8 [requires: wcwidth]
     - ipython==7.13.0 [requires: prompt-toolkit>=2.0.0,<3.1.0,!=3.0.1,!=3.0.0]
 Werkzeug==1.0.1
   - Flask==1.1.2 [requires: Werkzeug>=0.15]
     - Flask-Script==2.0.6 [requires: Flask]
-wheel==0.35.1
+wheel==0.36.2