1
0
Fork 0
mirror of https://github.com/nginx-proxy/nginx-proxy synced 2024-05-18 21:46:06 +02:00
Commit Graph

434 Commits

Author SHA1 Message Date
Steve Kamerman 98b5828f83 Modified tests to include dhparams 2017-03-07 14:04:44 -05:00
Steve Kamerman 0244b4e71e Added dhparams test in new format 2017-03-07 14:04:37 -05:00
Steve Kamerman ad9af2884d Merged master, fixed BATS conflict 2017-03-06 10:48:12 -05:00
Jason Wilder 6554a1cf28 Merge pull request #732 from matt-hh/feature/upgrade-1.11.10
Upgrade to nginx 1.11.10
2017-02-21 10:18:23 -07:00
Matthias Döring 7bafa37a52 Upgrade to nginx 1.11.10 2017-02-21 14:03:54 +01:00
Jason Wilder 9e31d5042f Merge pull request #735 from thomasleveil/test_events
TESTS: add a test to verify nginx conf is updated
2017-02-20 22:57:19 -07:00
Thomas LEVEIL 2aef648f3d TESTS: add a test to verify nginx conf is update on container creation/deletion 2017-02-21 03:20:38 +01:00
Jason Wilder 68816390ee Merge pull request #655 from thomasleveil/pytest
rewrite tests using docker-compose and pytest
2017-02-18 09:52:38 -07:00
Thomas LEVEIL dd443f3eca TESTS: ignore the `requirements` and `certs` directory when collecting tests 2017-02-17 01:24:48 +01:00
Thomas LEVEIL 9620be91fa TESTS: separated containers: fix indentation and remove dependency over jwilder/whoami image 2017-02-17 01:11:11 +01:00
Thomas LEVEIL 85370fa31f TESTS: improve error reporting for failed to run `docker-compose` commands 2017-02-17 00:54:14 +01:00
Thomas LEVEIL 6069bc53cd TESTS: replace old test suite with the new one
get rid of Bats definitively
2017-02-17 00:29:30 +01:00
Thomas LEVEIL 250a01d235 TESTS: add tests for IPv6 support 2017-02-16 23:27:28 +01:00
Thomas LEVEIL 78375632dd TESTS: adjust Travis-CI config (upgrade to docker 1.13 and no more docker-compose) 2017-02-16 21:40:54 +01:00
Thomas LEVEIL a6e4f7f3ad TESTS: adjust Travis-CI config 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 02f9e29a31 TESTS: make pytest verbose by default 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 9f26efdf86 TESTS: add tests for IPv6 2017-02-16 21:40:54 +01:00
Thomas LEVEIL e6b9d2f5e7 TESTS: show skip reason in test summary 2017-02-16 21:40:54 +01:00
Thomas LEVEIL eeb27f7b50 TESTS: fix failure raising when cannot get nginx-proxy nginx configuration file 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 43d8ba0e78 TESTS: add tests for using nginx and docker-gen in separated containers 2017-02-16 21:40:54 +01:00
Thomas LEVEIL a533ff6aff TESTS: add support for resolving containers IP address from domain names in the form *.<container name>.container.docker 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 743d9801e9 TESTS: make test now runs tests from a docker container 2017-02-16 21:40:54 +01:00
Thomas LEVEIL e6bc7e6043 TESTS: rename nginx-proxy-tester.sh to test.sh 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 87926db4c3 TESTS: upgrade to docker python module 2.0.2 and docker-compose 1.11.1 2017-02-16 21:40:54 +01:00
Thomas LEVEIL fdde850fc2 TESTS: pytest checks the existance of the jwilder/nginx-proxy:test image 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 3e92192dc4 TESTS: add test for multiple networks 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 3ecae2f020 TESTS: the docker_compose pytest fixture is now responsible for attaching the container running pytest to all docker networks 2017-02-16 21:40:54 +01:00
Thomas LEVEIL dcf8dd4682 TESTS: refactor conftest.py 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 3f88ba8903 TESTS: refactor conftest.py 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 10cd3e5f81 TESTS: refactor conftest.py 2017-02-16 21:40:54 +01:00
Steve Kamerman ad57c48465 Fixed HTTPS test 2017-02-16 21:40:54 +01:00
Steve Kamerman 912f5615dc Reorganized certs 2017-02-16 21:40:54 +01:00
Steve Kamerman 8995ba02ba Fixed assertion bug 2017-02-16 21:40:54 +01:00
Steve Kamerman d0e5870060 Added certs, fixed typos 2017-02-16 21:40:54 +01:00
Steve Kamerman 65371e513a Renamed wildcard cert and key 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 087592df2c TESTS: simplify nginx-proxy-tester.sh 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 9d8f0db268 TESTS: remove containers after each test 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 541ce48292 fixup! TESTS: add support for compose syntax v2 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 889dfea4ca TESTS: adjust logging (when using pytest -s) 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 150365e784 fixup! TESTS: add test for custom default configuration 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 23d361d1da TESTS: reorganize tests into subfolders 2017-02-16 21:40:54 +01:00
Thomas LEVEIL eeed150858 README: fix instruction for overriding default custom conf 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 8aa3158952 TESTS: add test for custom default location configuration 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 713149df8e TESTS: add test for custom default configuration 2017-02-16 21:40:54 +01:00
Thomas LEVEIL ee5b0f96ad TESTS: add test for custom per vhost configuration in location block 2017-02-16 21:40:54 +01:00
Thomas LEVEIL a283c95e2e TESTS: nginxproxy fixture can provide the nginx generated conf in tests 2017-02-16 21:40:54 +01:00
Thomas LEVEIL f512a56faf TESTS: add test for custom per vhost configuration 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 2425574958 TESTS: add test for custom proxy-wide configuration 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 73fda600b3 TESTS: add verbosity 2017-02-16 21:40:54 +01:00
Thomas LEVEIL 0d00bd2322 TESTS: fix passing pytests args to nginx-proxy-tester script 2017-02-16 21:40:54 +01:00