From b9cb55be01ca2bfa0e7c32d31fa633173da603f1 Mon Sep 17 00:00:00 2001 From: Vineet Naik Date: Sat, 31 Jul 2021 11:38:13 +0530 Subject: [PATCH] Fix e2e tests --- tests/e2e-tests | 2 +- tests/profiles/conflicting/default.err | 4 +- tests/profiles/conflicting/default.out | 8 +- tests/profiles/conflicting/reverse.out | 6 +- tests/profiles/cyclic/default.out | 6 +- tests/profiles/webapp/all_flag.out | 98 +++++++++++++--------- tests/profiles/webapp/default.out | 36 ++++---- tests/profiles/webapp/packages_opt.out | 18 ++-- tests/profiles/webapp/packages_reverse.out | 4 +- tests/profiles/webapp/reverse.out | 46 +++++----- 10 files changed, 129 insertions(+), 99 deletions(-) diff --git a/tests/e2e-tests b/tests/e2e-tests index 3d4ff03..cbd569e 100755 --- a/tests/e2e-tests +++ b/tests/e2e-tests @@ -43,6 +43,6 @@ export PIPDEPTREE_EXE=$TEST_PROFILE_DIR/$pip_deptree cd - -py.test e2e_tests.py +pytest -v e2e_tests.py diff --git a/tests/profiles/conflicting/default.err b/tests/profiles/conflicting/default.err index f371682..fac27c6 100644 --- a/tests/profiles/conflicting/default.err +++ b/tests/profiles/conflicting/default.err @@ -1,4 +1,4 @@ Warning!!! Possibly conflicting dependencies found: -* Jinja2==2.11.2 - - MarkupSafe [required: >=0.23, installed: 0.22] +* Jinja2==3.0.1 + - MarkupSafe [required: >=2.0, installed: 0.22] ------------------------------------------------------------------------ diff --git a/tests/profiles/conflicting/default.out b/tests/profiles/conflicting/default.out index b70118f..d803719 100644 --- a/tests/profiles/conflicting/default.out +++ b/tests/profiles/conflicting/default.out @@ -1,9 +1,9 @@ Flask==0.10.1 - itsdangerous [required: >=0.21, installed: 0.24] - - Jinja2 [required: >=2.4, installed: 2.11.2] - - MarkupSafe [required: >=0.23, installed: 0.22] + - Jinja2 [required: >=2.4, installed: 3.0.1] + - MarkupSafe [required: >=2.0, installed: 0.22] - Werkzeug [required: >=0.7, installed: 0.11.2] -pipdeptree==2.0.0b1 +pipdeptree==2.0.0 - pip [required: >=6.0.0, installed: 20.2.3] -setuptools==51.0.0 +setuptools==57.4.0 wheel==0.36.2 diff --git a/tests/profiles/conflicting/reverse.out b/tests/profiles/conflicting/reverse.out index 2f87db2..e8fb05b 100644 --- a/tests/profiles/conflicting/reverse.out +++ b/tests/profiles/conflicting/reverse.out @@ -1,11 +1,11 @@ itsdangerous==0.24 - Flask==0.10.1 [requires: itsdangerous>=0.21] MarkupSafe==0.22 - - Jinja2==2.11.2 [requires: MarkupSafe>=0.23] + - Jinja2==3.0.1 [requires: MarkupSafe>=2.0] - Flask==0.10.1 [requires: Jinja2>=2.4] pip==20.2.3 - - pipdeptree==2.0.0b1 [requires: pip>=6.0.0] -setuptools==51.0.0 + - pipdeptree==2.0.0 [requires: pip>=6.0.0] +setuptools==57.4.0 Werkzeug==0.11.2 - Flask==0.10.1 [requires: Werkzeug>=0.7] wheel==0.36.2 diff --git a/tests/profiles/cyclic/default.out b/tests/profiles/cyclic/default.out index 5f64d32..560695a 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.3.3] -setuptools==51.0.0 +pipdeptree==2.0.0 + - pip [required: >=6.0.0, installed: 21.2.1] +setuptools==57.4.0 wheel==0.36.2 diff --git a/tests/profiles/webapp/all_flag.out b/tests/profiles/webapp/all_flag.out index 8b109c8..2a0c4f6 100644 --- a/tests/profiles/webapp/all_flag.out +++ b/tests/profiles/webapp/all_flag.out @@ -1,65 +1,83 @@ appnope==0.1.2 backcall==0.2.0 -click==7.1.2 -decorator==4.4.2 +click==8.0.1 + - importlib-metadata [required: Any, installed: 4.6.2] + - typing-extensions [required: >=3.6.4, installed: 3.10.0.0] + - zipp [required: >=0.5, installed: 3.5.0] +dataclasses==0.8 +decorator==5.0.9 Flask==1.1.2 - - click [required: >=5.1, installed: 7.1.2] - - itsdangerous [required: >=0.24, installed: 1.1.0] - - Jinja2 [required: >=2.10.1, installed: 2.11.2] - - MarkupSafe [required: >=0.23, installed: 1.1.1] - - Werkzeug [required: >=0.15, installed: 1.0.1] + - click [required: >=5.1, installed: 8.0.1] + - importlib-metadata [required: Any, installed: 4.6.2] + - typing-extensions [required: >=3.6.4, installed: 3.10.0.0] + - zipp [required: >=0.5, installed: 3.5.0] + - itsdangerous [required: >=0.24, installed: 2.0.1] + - Jinja2 [required: >=2.10.1, installed: 3.0.1] + - MarkupSafe [required: >=2.0, installed: 2.0.1] + - Werkzeug [required: >=0.15, installed: 2.0.1] + - dataclasses [required: Any, installed: 0.8] Flask-Script==2.0.6 - Flask [required: Any, installed: 1.1.2] - - click [required: >=5.1, installed: 7.1.2] - - itsdangerous [required: >=0.24, installed: 1.1.0] - - Jinja2 [required: >=2.10.1, installed: 2.11.2] - - MarkupSafe [required: >=0.23, installed: 1.1.1] - - Werkzeug [required: >=0.15, installed: 1.0.1] + - click [required: >=5.1, installed: 8.0.1] + - importlib-metadata [required: Any, installed: 4.6.2] + - typing-extensions [required: >=3.6.4, installed: 3.10.0.0] + - zipp [required: >=0.5, installed: 3.5.0] + - itsdangerous [required: >=0.24, installed: 2.0.1] + - Jinja2 [required: >=2.10.1, installed: 3.0.1] + - MarkupSafe [required: >=2.0, installed: 2.0.1] + - Werkzeug [required: >=0.15, installed: 2.0.1] + - dataclasses [required: Any, installed: 0.8] gnureadline==8.0.0 +importlib-metadata==4.6.2 + - typing-extensions [required: >=3.6.4, installed: 3.10.0.0] + - zipp [required: >=0.5, installed: 3.5.0] ipython==7.13.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] - - parso [required: >=0.7.0,<0.8.0, installed: 0.7.1] + - decorator [required: Any, installed: 5.0.9] + - jedi [required: >=0.10, installed: 0.18.0] + - parso [required: >=0.8.0,<0.9.0, installed: 0.8.2] - pexpect [required: Any, installed: 4.8.0] - - ptyprocess [required: >=0.5, installed: 0.6.0] + - ptyprocess [required: >=0.5, installed: 0.7.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.8] + - prompt-toolkit [required: >=2.0.0,<3.1.0,!=3.0.1,!=3.0.0, installed: 3.0.19] - wcwidth [required: Any, installed: 0.2.5] - - pygments [required: Any, installed: 2.7.3] - - setuptools [required: >=18.5, installed: 51.0.0] + - pygments [required: Any, installed: 2.9.0] + - setuptools [required: >=18.5, installed: 57.4.0] - traitlets [required: >=4.2, installed: 4.3.3] - - decorator [required: Any, installed: 4.4.2] + - decorator [required: Any, installed: 5.0.9] - ipython-genutils [required: Any, installed: 0.2.0] - - six [required: Any, installed: 1.15.0] + - six [required: Any, installed: 1.16.0] ipython-genutils==0.2.0 -itsdangerous==1.1.0 -jedi==0.17.2 - - parso [required: >=0.7.0,<0.8.0, installed: 0.7.1] -Jinja2==2.11.2 - - MarkupSafe [required: >=0.23, installed: 1.1.1] -MarkupSafe==1.1.1 -parso==0.7.1 +itsdangerous==2.0.1 +jedi==0.18.0 + - parso [required: >=0.8.0,<0.9.0, installed: 0.8.2] +Jinja2==3.0.1 + - MarkupSafe [required: >=2.0, installed: 2.0.1] +MarkupSafe==2.0.1 +parso==0.8.2 pexpect==4.8.0 - - ptyprocess [required: >=0.5, installed: 0.6.0] + - ptyprocess [required: >=0.5, installed: 0.7.0] pickleshare==0.7.5 -pip==20.3.3 -pipdeptree==2.0.0b1 - - pip [required: >=6.0.0, installed: 20.3.3] -prompt-toolkit==3.0.8 +pip==21.2.1 +pipdeptree==2.0.0 + - pip [required: >=6.0.0, installed: 21.2.1] +prompt-toolkit==3.0.19 - wcwidth [required: Any, installed: 0.2.5] -ptyprocess==0.6.0 -Pygments==2.7.3 +ptyprocess==0.7.0 +Pygments==2.9.0 pymongo==3.10.1 redis==3.4.1 -setuptools==51.0.0 -six==1.15.0 +setuptools==57.4.0 +six==1.16.0 slugify==0.0.1 traitlets==4.3.3 - - decorator [required: Any, installed: 4.4.2] + - decorator [required: Any, installed: 5.0.9] - ipython-genutils [required: Any, installed: 0.2.0] - - six [required: Any, installed: 1.15.0] + - six [required: Any, installed: 1.16.0] +typing-extensions==3.10.0.0 wcwidth==0.2.5 -Werkzeug==1.0.1 +Werkzeug==2.0.1 + - dataclasses [required: Any, installed: 0.8] wheel==0.36.2 +zipp==3.5.0 diff --git a/tests/profiles/webapp/default.out b/tests/profiles/webapp/default.out index 8c9b3ad..57b3b09 100644 --- a/tests/profiles/webapp/default.out +++ b/tests/profiles/webapp/default.out @@ -1,30 +1,34 @@ Flask-Script==2.0.6 - Flask [required: Any, installed: 1.1.2] - - click [required: >=5.1, installed: 7.1.2] - - itsdangerous [required: >=0.24, installed: 1.1.0] - - Jinja2 [required: >=2.10.1, installed: 2.11.2] - - MarkupSafe [required: >=0.23, installed: 1.1.1] - - Werkzeug [required: >=0.15, installed: 1.0.1] + - click [required: >=5.1, installed: 8.0.1] + - importlib-metadata [required: Any, installed: 4.6.2] + - typing-extensions [required: >=3.6.4, installed: 3.10.0.0] + - zipp [required: >=0.5, installed: 3.5.0] + - itsdangerous [required: >=0.24, installed: 2.0.1] + - Jinja2 [required: >=2.10.1, installed: 3.0.1] + - MarkupSafe [required: >=2.0, installed: 2.0.1] + - Werkzeug [required: >=0.15, installed: 2.0.1] + - dataclasses [required: Any, installed: 0.8] gnureadline==8.0.0 ipython==7.13.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] - - parso [required: >=0.7.0,<0.8.0, installed: 0.7.1] + - decorator [required: Any, installed: 5.0.9] + - jedi [required: >=0.10, installed: 0.18.0] + - parso [required: >=0.8.0,<0.9.0, installed: 0.8.2] - pexpect [required: Any, installed: 4.8.0] - - ptyprocess [required: >=0.5, installed: 0.6.0] + - ptyprocess [required: >=0.5, installed: 0.7.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.8] + - prompt-toolkit [required: >=2.0.0,<3.1.0,!=3.0.1,!=3.0.0, installed: 3.0.19] - wcwidth [required: Any, installed: 0.2.5] - - pygments [required: Any, installed: 2.7.3] - - setuptools [required: >=18.5, installed: 51.0.0] + - pygments [required: Any, installed: 2.9.0] + - setuptools [required: >=18.5, installed: 57.4.0] - traitlets [required: >=4.2, installed: 4.3.3] - - decorator [required: Any, installed: 4.4.2] + - decorator [required: Any, installed: 5.0.9] - 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.3.3] + - six [required: Any, installed: 1.16.0] +pipdeptree==2.0.0 + - pip [required: >=6.0.0, installed: 21.2.1] pymongo==3.10.1 redis==3.4.1 slugify==0.0.1 diff --git a/tests/profiles/webapp/packages_opt.out b/tests/profiles/webapp/packages_opt.out index ee24339..a1313c0 100644 --- a/tests/profiles/webapp/packages_opt.out +++ b/tests/profiles/webapp/packages_opt.out @@ -1,17 +1,17 @@ ipython==7.13.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] - - parso [required: >=0.7.0,<0.8.0, installed: 0.7.1] + - decorator [required: Any, installed: 5.0.9] + - jedi [required: >=0.10, installed: 0.18.0] + - parso [required: >=0.8.0,<0.9.0, installed: 0.8.2] - pexpect [required: Any, installed: 4.8.0] - - ptyprocess [required: >=0.5, installed: 0.6.0] + - ptyprocess [required: >=0.5, installed: 0.7.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.8] + - prompt-toolkit [required: >=2.0.0,<3.1.0,!=3.0.1,!=3.0.0, installed: 3.0.19] - wcwidth [required: Any, installed: 0.2.5] - - pygments [required: Any, installed: 2.7.3] - - setuptools [required: >=18.5, installed: 51.0.0] + - pygments [required: Any, installed: 2.9.0] + - setuptools [required: >=18.5, installed: 57.4.0] - traitlets [required: >=4.2, installed: 4.3.3] - - decorator [required: Any, installed: 4.4.2] + - decorator [required: Any, installed: 5.0.9] - ipython-genutils [required: Any, installed: 0.2.0] - - six [required: Any, installed: 1.15.0] + - six [required: Any, installed: 1.16.0] diff --git a/tests/profiles/webapp/packages_reverse.out b/tests/profiles/webapp/packages_reverse.out index fe8f007..1fba115 100644 --- a/tests/profiles/webapp/packages_reverse.out +++ b/tests/profiles/webapp/packages_reverse.out @@ -1,7 +1,7 @@ -click==7.1.2 +click==8.0.1 - Flask==1.1.2 [requires: click>=5.1] - Flask-Script==2.0.6 [requires: Flask] -decorator==4.4.2 +decorator==5.0.9 - ipython==7.13.0 [requires: decorator] - traitlets==4.3.3 [requires: decorator] - ipython==7.13.0 [requires: traitlets>=4.2] diff --git a/tests/profiles/webapp/reverse.out b/tests/profiles/webapp/reverse.out index 1fae417..c57b381 100644 --- a/tests/profiles/webapp/reverse.out +++ b/tests/profiles/webapp/reverse.out @@ -2,10 +2,11 @@ appnope==0.1.2 - ipython==7.13.0 [requires: appnope] backcall==0.2.0 - ipython==7.13.0 [requires: backcall] -click==7.1.2 - - Flask==1.1.2 [requires: click>=5.1] - - Flask-Script==2.0.6 [requires: Flask] -decorator==4.4.2 +dataclasses==0.8 + - Werkzeug==2.0.1 [requires: dataclasses] + - Flask==1.1.2 [requires: Werkzeug>=0.15] + - Flask-Script==2.0.6 [requires: Flask] +decorator==5.0.9 - ipython==7.13.0 [requires: decorator] - traitlets==4.3.3 [requires: decorator] - ipython==7.13.0 [requires: traitlets>=4.2] @@ -13,37 +14,44 @@ gnureadline==8.0.0 ipython-genutils==0.2.0 - traitlets==4.3.3 [requires: ipython-genutils] - ipython==7.13.0 [requires: traitlets>=4.2] -itsdangerous==1.1.0 +itsdangerous==2.0.1 - Flask==1.1.2 [requires: itsdangerous>=0.24] - Flask-Script==2.0.6 [requires: Flask] -MarkupSafe==1.1.1 - - Jinja2==2.11.2 [requires: MarkupSafe>=0.23] +MarkupSafe==2.0.1 + - Jinja2==3.0.1 [requires: MarkupSafe>=2.0] - Flask==1.1.2 [requires: Jinja2>=2.10.1] - Flask-Script==2.0.6 [requires: Flask] -parso==0.7.1 - - jedi==0.17.2 [requires: parso>=0.7.0,<0.8.0] +parso==0.8.2 + - jedi==0.18.0 [requires: parso>=0.8.0,<0.9.0] - ipython==7.13.0 [requires: jedi>=0.10] pickleshare==0.7.5 - ipython==7.13.0 [requires: pickleshare] -pip==20.3.3 - - pipdeptree==2.0.0b1 [requires: pip>=6.0.0] -ptyprocess==0.6.0 +pip==21.2.1 + - pipdeptree==2.0.0 [requires: pip>=6.0.0] +ptyprocess==0.7.0 - pexpect==4.8.0 [requires: ptyprocess>=0.5] - ipython==7.13.0 [requires: pexpect] -pygments==2.7.3 +pygments==2.9.0 - ipython==7.13.0 [requires: pygments] pymongo==3.10.1 redis==3.4.1 -setuptools==51.0.0 +setuptools==57.4.0 - ipython==7.13.0 [requires: setuptools>=18.5] -six==1.15.0 +six==1.16.0 - traitlets==4.3.3 [requires: six] - ipython==7.13.0 [requires: traitlets>=4.2] slugify==0.0.1 +typing-extensions==3.10.0.0 + - importlib-metadata==4.6.2 [requires: typing-extensions>=3.6.4] + - click==8.0.1 [requires: importlib-metadata] + - Flask==1.1.2 [requires: click>=5.1] + - Flask-Script==2.0.6 [requires: Flask] wcwidth==0.2.5 - - prompt-toolkit==3.0.8 [requires: wcwidth] + - prompt-toolkit==3.0.19 [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.36.2 +zipp==3.5.0 + - importlib-metadata==4.6.2 [requires: zipp>=0.5] + - click==8.0.1 [requires: importlib-metadata] + - Flask==1.1.2 [requires: click>=5.1] + - Flask-Script==2.0.6 [requires: Flask]