Allow argument for test framework version and mark regional tests (aws#382)

* Allow argument for test framework version and mark regional tests

* correct typo

Author: yangaws

tests/conftest.py

@@ -33,6 +33,10 @@ def pytest_addoption(parser):
     parser.addoption('--sagemaker-client-config', action='store', default=None)
     parser.addoption('--sagemaker-runtime-config', action='store', default=None)
     parser.addoption('--boto-config', action='store', default=None)
+    parser.addoption('--tf-full-version', action='store', default=TF_VERSION)
+    parser.addoption('--mxnet-full-version', action='store', default=MXNET_VERSION)
+    parser.addoption('--chainer-full-version', action='store', default=CHAINER_VERSION)
+    parser.addoption('--pytorch-full-version', action='store', default=PYTORCH_VERSION)
 
 
 @pytest.fixture(scope='session')
@@ -96,21 +100,21 @@ def chainer_version(request):
     return request.param
 
 
-@pytest.fixture(scope='module', params=[TF_VERSION])
+@pytest.fixture(scope='module')
 def tf_full_version(request):
-    return request.param
+    return request.config.getoption('--tf-full-version')
 
 
-@pytest.fixture(scope='module', params=[MXNET_VERSION])
+@pytest.fixture(scope='module')
 def mxnet_full_version(request):
-    return request.param
+    return request.config.getoption('--mxnet-full-version')
 
 
-@pytest.fixture(scope='module', params=[PYTORCH_VERSION])
+@pytest.fixture(scope='module')
 def pytorch_full_version(request):
-    return request.param
+    return request.config.getoption('--pytorch-full-version')
 
 
-@pytest.fixture(scope='module', params=[CHAINER_VERSION])
+@pytest.fixture(scope='module')
 def chainer_full_version(request):
-    return request.param
+    return request.config.getoption('--chainer-full-version')

tests/integ/test_chainer_train.py

@@ -64,6 +64,7 @@ def test_training_with_additional_hyperparameters(sagemaker_session, chainer_ful
 
 
 @pytest.mark.continuous_testing
+@pytest.mark.regional_testing
 def test_attach_deploy(chainer_training_job, sagemaker_session):
     endpoint_name = 'test-chainer-attach-deploy-{}'.format(sagemaker_timestamp())
 

tests/integ/test_mxnet_train.py

@@ -45,6 +45,7 @@ def mxnet_training_job(sagemaker_session, mxnet_full_version):
 
 
 @pytest.mark.continuous_testing
+@pytest.mark.regional_testing
 def test_attach_deploy(mxnet_training_job, sagemaker_session):
     endpoint_name = 'test-mxnet-attach-deploy-{}'.format(sagemaker_timestamp())
 

tests/integ/test_pytorch_train.py

@@ -36,6 +36,7 @@ def fixture_training_job(sagemaker_session, pytorch_full_version):
 
 
 @pytest.mark.continuous_testing
+@pytest.mark.regional_testing
 def test_sync_fit_deploy(pytorch_training_job, sagemaker_session):
     # TODO: add tests against local mode when it's ready to be used
     endpoint_name = 'test-pytorch-sync-fit-attach-deploy{}'.format(sagemaker_timestamp())

tests/integ/test_tf.py

@@ -27,6 +27,7 @@
 
 
 @pytest.mark.continuous_testing
+@pytest.mark.regional_testing
 @pytest.mark.skipif(PYTHON_VERSION != 'py2', reason="TensorFlow image supports only python 2.")
 def test_tf(sagemaker_session, tf_full_version):
     with timeout(minutes=TRAINING_DEFAULT_TIMEOUT_MINUTES):