* ignore testDeleteObjectPreconditions in encryption tests (preconditions will fail due to MD update from encryption client)

* getBucketLifecycle() now detects "NoSuchLifecyclePolicy" error code (this was corrected in ECS 3.8 from "NoSuchBucketPolicy" in prior versions)

Author: twincitiesguy

src/main/java/com/emc/object/s3/jersey/S3JerseyClient.java

@@ -389,7 +389,8 @@ public LifecycleConfiguration getBucketLifecycle(String bucketName) {
         try {
             return executeRequest(client, request, LifecycleConfiguration.class);
         } catch (S3Exception e) {
-            if ("NoSuchBucketPolicy".equals(e.getErrorCode())) return null;
+            if ("NoSuchBucketPolicy".equals(e.getErrorCode()) || "NoSuchLifecycleConfiguration".equals(e.getErrorCode()))
+                return null;
             throw e;
         }
     }

src/test/java/com/emc/object/s3/S3EncryptionClientBasicTest.java

@@ -527,6 +527,11 @@ public void testCreateObjectWithRetentionPolicy() {
     public void testPutObjectPreconditions() {
     }
 
+    @Ignore
+    @Override
+    public void testDeleteObjectPreconditions() {
+    }
+
     @Ignore
     @Override
     public void testCopyObjectSelf() {

src/test/java/com/emc/object/s3/S3MetadataSearchTest.java

@@ -46,10 +46,10 @@ protected void createBucket(String bucketName) throws Exception {
 
     @Test
     public void testListSystemMetadataSearchKeys() throws Exception {
-        boolean is37OrLater = ecsVersion != null && ecsVersion.compareTo("3.7") >= 0;
+        boolean is37x = ecsVersion != null && ecsVersion.matches("3\\.7\\..*");
         MetadataSearchKey[] expectedIndexableKeys;
         MetadataSearchKey[] expectedOptionalAttributes;
-        if (!is37OrLater) {
+        if (!is37x) {
             expectedIndexableKeys = new MetadataSearchKey[]{
                     new MetadataSearchKey("CreateTime", MetadataSearchDatatype.datetime),
                     new MetadataSearchKey("LastModified", MetadataSearchDatatype.datetime),