address PR comments and OSError for reading stdin

Author: laurenyu

tests/integ/file_system_input_utils.py

@@ -121,14 +121,15 @@ def _connect_ec2_instance(ec2_instance):
 
 def _upload_data_and_mount_fs(connected_instance, file_system_efs_id, file_system_fsx_id):
     connected_instance.put(FS_MOUNT_SCRIPT, ".")
-    connected_instance.run("mkdir temp_tf; mkdir temp_one_p")
+    connected_instance.run("mkdir temp_tf; mkdir temp_one_p", in_stream=False)
     for dir_name, subdir_list, file_list in os.walk(MNIST_LOCAL_DATA):
         for fname in file_list:
             local_file = os.path.join(MNIST_LOCAL_DATA, fname)
             connected_instance.put(local_file, "temp_tf/")
     connected_instance.put(ONE_P_LOCAL_DATA, "temp_one_p/")
     connected_instance.run(
-        "sudo sh fs_mount_setup.sh {} {}".format(file_system_efs_id, file_system_fsx_id)
+        "sudo sh fs_mount_setup.sh {} {}".format(file_system_efs_id, file_system_fsx_id),
+        in_stream=False,
     )
 
 

tests/integ/vpc_test_utils.py

@@ -21,15 +21,15 @@
 LOCK_PATH = os.path.join(tempfile.gettempdir(), "sagemaker_test_vpc_lock")
 
 
-def _subnet_ids_by_name(ec2_client, name):
+def _get_subnet_ids_by_name(ec2_client, name):
     desc = ec2_client.describe_subnets(Filters=[{"Name": "tag-value", "Values": [name]}])
     if len(desc["Subnets"]) == 0:
         return None
     else:
         return [subnet["SubnetId"] for subnet in desc["Subnets"]]
 
 
-def _security_id_by_name(ec2_client, name):
+def _get_security_id_by_name(ec2_client, name):
     desc = ec2_client.describe_security_groups(Filters=[{"Name": "tag-value", "Values": [name]}])
     if len(desc["SecurityGroups"]) == 0:
         return None
@@ -70,7 +70,7 @@ def check_or_create_vpc_resources_efs_fsx(sagemaker_session, region, name=VPC_NA
         if _vpc_exists(ec2_client, name):
             vpc_id = _vpc_id_by_name(ec2_client, name)
             return (
-                _subnet_ids_by_name(ec2_client, name),
+                _get_subnet_ids_by_name(ec2_client, name),
                 _security_group_ids_by_vpc_id(sagemaker_session, vpc_id),
             )
         else:
@@ -184,7 +184,10 @@ def get_or_create_vpc_resources(ec2_client, region, name=VPC_NAME):
     with lock.lock(LOCK_PATH):
         if _vpc_exists(ec2_client, name):
             print("using existing vpc: {}".format(name))
-            return (_subnet_ids_by_name(ec2_client, name), _security_id_by_name(ec2_client, name))
+            return (
+                _get_subnet_ids_by_name(ec2_client, name),
+                _get_security_id_by_name(ec2_client, name),
+            )
         else:
             print("creating new vpc: {}".format(name))
             return _create_vpc_with_name(ec2_client, region, name)