Updating handwritten shim tests for ls -L flag. (GoogleCloudPlatform#1860)

Author: pujawadare

gslib/tests/test_cp.py

@@ -3385,11 +3385,7 @@ def test_nearline_applied_to_parallel_composite_upload(self):
     ]):
       self.RunGsUtil(['cp', '-s', 'nearline', fpath, obj_suri])
     stdout = self.RunGsUtil(['ls', '-L', obj_suri], return_stdout=True)
-    if self._use_gcloud_storage:
-      self.assertRegexpMatchesWithFlags(
-          stdout, r'Storage class:               NEARLINE', flags=re.IGNORECASE)
-    else:
-      self.assertRegexpMatchesWithFlags(stdout,
+    self.assertRegexpMatchesWithFlags(stdout,
                                         r'Storage class:          NEARLINE',
                                         flags=re.IGNORECASE)
 

gslib/tests/test_ls.py

@@ -679,7 +679,7 @@ def test_logging(self):
     stdout = self.RunGsUtil(['ls', '-lb', bucket_suri], return_stdout=True)
     self.assertNotIn('Logging configuration', stdout)
 
-    spacing = '       ' if self._use_gcloud_storage else '\t\t'
+    spacing = '\t\t'
     # Logging configuration is absent by default
     stdout = self.RunGsUtil(['ls', '-Lb', bucket_suri], return_stdout=True)
     self.assertIn('Logging configuration:{}None'.format(spacing), stdout)
@@ -704,7 +704,7 @@ def test_web(self):
     stdout = self.RunGsUtil(['ls', '-lb', bucket_suri], return_stdout=True)
     self.assertNotIn('Website configuration', stdout)
 
-    spacing = '       ' if self._use_gcloud_storage else '\t\t'
+    spacing = '\t\t'
     # Website configuration is absent by default
     stdout = self.RunGsUtil(['ls', '-Lb', bucket_suri], return_stdout=True)
     self.assertIn('Website configuration:{}None'.format(spacing), stdout)
@@ -726,7 +726,7 @@ def test_requesterpays(self):
     bucket_uri = self.CreateBucket()
     bucket_suri = suri(bucket_uri)
 
-    spacing = '      ' if self._use_gcloud_storage else '\t\t'
+    spacing = '\t\t'
     # No requester pays configuration
     stdout = self.RunGsUtil(['ls', '-lb', bucket_suri], return_stdout=True)
     self.assertNotIn('Requester Pays enabled', stdout)