updating test runners to use pytest marks

Author: mattsb42-aws

.travis.yml

@@ -3,13 +3,37 @@ language: python
 matrix:
   include:
     - python: 2.7
-      env: TOXENV=py27
+      env: TOXENV=py27-local
+    - python: 2.7
+      env: TOXENV=py27-integ
+    - python: 2.7
+      env: TOXENV=py27-accept
+    - python: 2.7
+      env: TOXENV=py27-examples
+    - python: 3.4
+      env: TOXENV=py34-local
     - python: 3.4
-      env: TOXENV=py34
+      env: TOXENV=py34-integ
+    - python: 3.4
+      env: TOXENV=py34-accept
+    - python: 3.4
+      env: TOXENV=py34-examples
+    - python: 3.5
+      env: TOXENV=py35-local
     - python: 3.5
-      env: TOXENV=py35
+      env: TOXENV=py35-integ
+    - python: 3.5
+      env: TOXENV=py35-accept
+    - python: 3.5
+      env: TOXENV=py35-examples
+    - python: 3.6
+      env: TOXENV=py36-local
     - python: 3.6
-      env: TOXENV=py36
+      env: TOXENV=py36-integ
+    - python: 3.6
+      env: TOXENV=py36-accept
+    - python: 3.6
+      env: TOXENV=py36-examples
     - python: 3.6
       env: TOXENV=bandit
     - python: 3.6
@@ -27,8 +51,6 @@ matrix:
       env: TOXENV=flake8-tests
     - python: 3.6
       env: TOXENV=pylint-tests
-    - python: 3.6
-      env: TOXENV=examples
     - python: 3.6
       env: TOXENV=flake8-examples
     - python: 3.6

tox.ini

@@ -1,10 +1,9 @@
 [tox]
 envlist =
-    py{27,34,35,36},
+    py{27,34,35,36}-{local,integ,accept,examples},
     bandit, doc8, readme, docs,
     flake8, pylint,
     flake8-tests, pylint-tests,
-    examples,
     flake8-examples, pylint-examples
 
 # Additional test environments:
@@ -21,12 +20,7 @@ envlist =
 # release :: Builds dist files and uploads to pypi pypirc profile.
 
 [testenv]
-# _TEST_CONTROL : 
-# _AWS_KMS_KEY_ID : 
-# AWS_ACCESS/SECRET/TOKEN : 
 passenv =
-    # Enables or disables integration tests ('RUN' enables)
-    AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_CONTROL \
     # Identifies AWS KMS key id to use in integration tests
     AWS_ENCRYPTION_SDK_PYTHON_INTEGRATION_TEST_AWS_KMS_KEY_ID \
     # Pass through AWS credentials
@@ -39,9 +33,11 @@ deps =
     pytest-mock
     coverage
 commands =
-    coverage run -m pytest \
-        --cov aws_encryption_sdk \
-        {posargs}
+    local: pytest --cov aws_encryption_sdk -m local -l {posargs}
+    integ: pytest --cov aws_encryption_sdk -m integ -l {posargs}
+    accept: pytest --cov aws_encryption_sdk -m accept -l {posargs}
+    all: pytest --cov aws_encryption_sdk -l {posargs}
+    examples: pytest --cov examples/test/ -m examples -l {posargs}
 
 # Examples
 [testenv:examples]