Add tox.ini and configure coverage and flake runs (aws#80)

* Add tox.ini and configure coverage and flake runs

* Add more unit tests
* Configure unit tests to run with both py2 and py3
* Add flake checks
* Fix broken integ tests

* Add import style check

* Add .flake8

* Add source module in coverage command

* Add newlines

Author: icywang86rui

src/tf_container/training.py

@@ -1,14 +1,14 @@
 #  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#  
+#
 #  Licensed under the Apache License, Version 2.0 (the "License").
 #  You may not use this file except in compliance with the License.
 #  A copy of the License is located at
-#  
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  or in the "license" file accompanying this file. This file is distributed 
-#  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-#  express or implied. See the License for the specific language governing 
+#
+#  or in the "license" file accompanying this file. This file is distributed
+#  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+#  express or implied. See the License for the specific language governing
 #  permissions and limitations under the License.
 from __future__ import absolute_import
 
@@ -17,7 +17,6 @@
 
 import boto3
 import pytest
-
 from sagemaker import LocalSession, Session
 
 logger = logging.getLogger(__name__)
@@ -92,4 +91,3 @@ def skip_by_device_type(request, processor):
 @pytest.fixture(scope='session')
 def docker_image(docker_base_name, tag):
     return '{}:{}'.format(docker_base_name, tag)
-

test/conftest.py

@@ -1,14 +1,14 @@
 #  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#  
+#
 #  Licensed under the Apache License, Version 2.0 (the "License").
 #  You may not use this file except in compliance with the License.
 #  A copy of the License is located at
-#  
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  or in the "license" file accompanying this file. This file is distributed 
-#  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-#  express or implied. See the License for the specific language governing 
+#
+#  or in the "license" file accompanying this file. This file is distributed
+#  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+#  express or implied. See the License for the specific language governing
 #  permissions and limitations under the License.
 from __future__ import absolute_import
 

test/integration/__init__.py

@@ -1,14 +1,14 @@
 #  Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-#  
+#
 #  Licensed under the Apache License, Version 2.0 (the "License").
 #  You may not use this file except in compliance with the License.
 #  A copy of the License is located at
-#  
+#
 #      http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  or in the "license" file accompanying this file. This file is distributed 
-#  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either 
-#  express or implied. See the License for the specific language governing 
+#
+#  or in the "license" file accompanying this file. This file is distributed
+#  on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+#  express or implied. See the License for the specific language governing
 #  permissions and limitations under the License.
 from __future__ import absolute_import
 
@@ -92,13 +92,13 @@ def execute_command(self, cmd):
         lines = []
         process = subprocess.Popen(docker_cmd, stdout=subprocess.PIPE)
         print(
-        '{}============================= container output ============================='.format(
-            CYAN_COLOR))
+            '{}========================= container output ========================='.format(
+                CYAN_COLOR))
         for line in iter(process.stdout.readline, b''):
             sys.stdout.write(line.decode('utf-8'))
             sys.stdout.flush()
             lines.append(line.decode('utf-8'))
-        msg = '\n{}============================= end of container output ============================='
+        msg = '\n{}========================= end of container output ========================='
         print(msg.format(CYAN_COLOR))
 
         process.wait()

test/integration/docker_utils.py

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 # Copyright 2017-2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-=======
-# Copyright 2017-2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
->>>>>>> Scriptmode single machine training implementation (#78)
 #
 # Licensed under the Apache License, Version 2.0 (the "License"). You
 # may not use this file except in compliance with the License. A copy of

test/integration/local/test_training.py

@@ -12,6 +12,9 @@
 #  permissions and limitations under the License.
 from __future__ import absolute_import
 <<<<<<< HEAD
+<<<<<<< HEAD
 =======
 
 >>>>>>> Scriptmode single machine training implementation (#78)
+=======
+>>>>>>> Add tox.ini and configure coverage and flake runs (#80)

test/unit/__init__.py

@@ -21,6 +21,7 @@
 # language governing permissions and limitations under the License.
 from __future__ import absolute_import
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 import os
 import sys
@@ -308,12 +309,17 @@ def test_main_tuning_mpi_model_dir(configure_s3_env, read_hyperparameters, train
     configure_s3_env.assert_called_once_with('/opt/ml/model', REGION)
 =======
 import pytest
+=======
+>>>>>>> Add tox.ini and configure coverage and flake runs (#80)
 from mock import MagicMock, patch
+import pytest
 
-from tf_container import training
+from sagemaker_tensorflow_container import training
 
 MODULE_DIR = 's3://my/bucket'
 MODULE_NAME = 'script_name'
+LOG_LEVEL = 'Debug'
+
 
 @pytest.fixture
 def single_machine_training_env():
@@ -322,12 +328,30 @@ def single_machine_training_env():
     env.module_dir = MODULE_DIR
     env.module_name = MODULE_NAME
     env.hyperparameters = {}
+    env.log_level = LOG_LEVEL
 
     return env
 
+
 @patch('sagemaker_containers.beta.framework.modules.run_module')
 def test_single_machine(run_module, single_machine_training_env):
     training.train(single_machine_training_env)
     run_module.assert_called_with(MODULE_DIR, single_machine_training_env.to_cmd_args(),
                                   single_machine_training_env.to_env_vars(), MODULE_NAME)
+<<<<<<< HEAD
 >>>>>>> Scriptmode single machine training implementation (#78)
+=======
+
+
+@patch('sagemaker_tensorflow_container.training.train')
+@patch('logging.Logger.setLevel')
+@patch('sagemaker_containers.beta.framework.training_env')
+@patch('sagemaker_containers.beta.framework.env.read_hyperparameters', return_value={})
+def test_main(read_hyperparameters, training_env, set_level, train, single_machine_training_env):
+    training_env.return_value = single_machine_training_env
+    training.main()
+    read_hyperparameters.assert_called_once_with()
+    training_env.assert_called_once_with(hyperparameters={})
+    set_level.assert_called_once_with(LOG_LEVEL)
+    train.assert_called_once_with(single_machine_training_env)
+>>>>>>> Add tox.ini and configure coverage and flake runs (#80)