Merge pull request #4304 from alexgibson/update-pytest

Update pytest to v3.0.1
mozilla · Aug 25, 2016 · 546e9fb · 546e9fb
2 parents bab8f81 + ef2efba
commit 546e9fb
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,4 +35,5 @@ mofo_security_advisories
 .env
 .cache
 tests/functional/results.html
+tests/functional/assets/style.css
 .eslintcache
diff --git a/requirements/test.txt b/requirements/test.txt
@@ -14,26 +14,28 @@ py==1.4.31 \
 PyPOM==1.0 \
     --hash=sha256:a8728981970404c3c9a14efeb23da92191749a4a4ad489130fd855e4cf8f154e \
     --hash=sha256:5c98e3d8ef2c7f96c3365a3b8295560446f2447eecdcfe393a30abf2fcc16d96
-pytest==2.9.1 \
-    --hash=sha256:3e635706fce07a734f7884a0ba32c46e5720225d861b3ed18ca76c6062de86cd \
-    --hash=sha256:0d48d27a127644fbe7c8158157e08b35f8255045d4476df694b91eb3a8147e65
-pytest-django==2.8.0 \
-    --hash=sha256:d145ac9dc7a557a719ab79770be0941004e1e038e137c34591919d9df2a790b1 \
-    --hash=sha256:d76f934e77fa073f48cc521945a49900a859e610fa029dd880d1d8b997b77c23
-pytest-html==1.8.0 \
-    --hash=sha256:cf323df228e265d6755ec39a26f2971acc59a31b0de0cfd026d341249dbeef69 \
-    --hash=sha256:dfe7a9cb41167414ca7b9e85afbd6694e8cc83fdbf57d0e545c215c32cd40cd6
-pytest-selenium==1.2.1 \
-    --hash=sha256:e82f0a265b0e238ac42ac275d79313d0a7e0bef1a450633aeb3d6549cc14f517 \
-    --hash=sha256:bd2121022ff3255ce82faec0ef3602462ec6bce9ca627b53462986cfc9b391e9
+pytest==3.0.1 \
+    --hash=sha256:ba6ae459222c3ee650d9e7a3f8cbf69c23c20ed6977496e9081f3b8da19107d0 \
+    --hash=sha256:e82bc0596ee96b2287c08705cfcb6898db1fe4b5c87db3b6823f1fdd77fb3ff1
+pytest-django==3.0.0 \
+    --hash=sha256:7898731205fa245926c800273dcffcd9b25e0b660a363ecb6cc2901ffe4aa1cc \
+    --hash=sha256:5952283b0e6e0f9d8cb46803636e3940e1c77da8a529f03a8a4320f52d9bf560
+pytest-html==1.10.0 \
+    --hash=sha256:c95e04dc2889bdd6b856b61710bb2a8b9510f423baa6912387e9aefffe9afa55 \
+    --hash=sha256:2093b97e41b4e8881a47e2926ea2343d7ce67d9d0f106bc21d5ba542e86e56d0
+pytest-selenium==1.3.1 \
+    --hash=sha256:e321bb93ac2b45fbe1f86f3512799fb7622253f0cebe1d87de1b2a11f7ee6a5e \
+    --hash=sha256:48dcdecafae6f5b8b3319770217b12114df317a7a60b82b9551a96e3e3988997
 pytest-variables==1.4 \
     --hash=sha256:29dcb084ed5d0c357e925c9a6cb454dbe7ae6192fdea2f9d1929f521b4e532e3 \
     --hash=sha256:bd2e152e64c8f670e7969c76219a7842cf8ede795703127981ed71af38cfe08a
 selenium==2.53.6 \
     --hash=sha256:5071f43daa2e698d60d5633ab0a6630cc68a852b360be99144f1c4c1ace2746c \
     --hash=sha256:f507181f13768d73b98dd9647a466ea5758ef5c7f07b62a285d2bd8de9b27016
-pytest-xdist==1.14 \
-    --hash=sha256:4a5e1199122fa29e3017d8d189f59ccc5d82e841474ba2a1eec0e89606153623 \
-    --hash=sha256:052f95dea01ccfc752f9f4828908bc6e16d4130ffc420b6e131019554a9957db
-pytest-rerunfailures==1.0.2 \
-    --hash=sha256:1fffd37a252dc9861a84097eab65584dad962a859c41db2f58fb42d7373efa89
+pytest-xdist==1.15.0 \
+    --hash=sha256:6238395f8bd050f9288a3b10f34330edece80f4424cf2b4204d6e7d622f0f00b
+pytest-rerunfailures==2.0.1 \
+    --hash=sha256:5b77224649ec1df6d5f0234a87cdea76ce1e74f5172e1dd8b80d79bbb8a6fdff
+pytest-base-url==1.1.0 \
+    --hash=sha256:90a1ce6a00a558231117b5aee32300edecbc0c2fd701c13e8cec62177900d28c \
+    --hash=sha256:001c1b2678dae82c2891db415251361b29ed6824cb2085e4821635119499071e
diff --git a/setup.cfg b/setup.cfg
@@ -10,7 +10,7 @@ exclude-dir=tests/redirects
             tests/functional
             tests/pages
 
-[pytest]
+[tool:pytest]
 addopts = --showlocals -r a --ignore=node_modules
 DJANGO_SETTINGS_MODULE = bedrock.settings
 sensitive_url = (mozilla\.(com|org)|bedrock-prod)