tests: added scenarios 4 and 6 (#1686)

Author: shaffeeullah

handwritten/storage/conformance-test/test-data/retryStrategyTestData.json

@@ -248,13 +248,31 @@
       },
       {
         "id": 4,
-        "description": "non idempotent",
+        "description": "non_idempotent",
         "cases": [
           {
-            "instructions": []
+            "instructions": ["return-503"]
+          },
+          {
+            "instructions": ["return-reset-connection"]
           }
         ],
-        "methods": [],
+        "methods": [
+          {"name": "storage.bucket_acl.delete",             "resources": ["BUCKET"]},
+          {"name": "storage.bucket_acl.insert",             "resources": ["BUCKET"]},
+          {"name": "storage.bucket_acl.patch",              "resources": ["BUCKET"]},
+          {"name": "storage.bucket_acl.update",             "resources": ["BUCKET"]},
+          {"name": "storage.default_object_acl.delete",     "resources": ["BUCKET"]},
+          {"name": "storage.default_object_acl.insert",     "resources": ["BUCKET"]},
+          {"name": "storage.default_object_acl.patch",      "resources": ["BUCKET"]},
+          {"name": "storage.default_object_acl.update",     "resources": ["BUCKET"]},
+          {"name": "storage.hmacKey.create",                "resources": []},
+          {"name": "storage.notifications.insert",          "resources": ["BUCKET"]},
+          {"name": "storage.object_acl.delete",             "resources": ["BUCKET", "OBJECT"]},
+          {"name": "storage.object_acl.insert",             "resources": ["BUCKET", "OBJECT"]},
+          {"name": "storage.object_acl.patch",              "resources": ["BUCKET", "OBJECT"]},
+          {"name": "storage.object_acl.update",             "resources": ["BUCKET", "OBJECT"]}
+        ],
         "preconditionProvided": false,
         "expectSuccess": false
       },
@@ -320,6 +338,55 @@
         ],
         "preconditionProvided": false,
         "expectSuccess": false
+      },
+      {
+        "id": 6,
+        "description": "mix_retryable_non_retryable_errors",
+        "cases": [
+          {
+            "instructions": ["return-503", "return-400"]
+          },
+          {
+            "instructions": ["return-reset-connection", "return-401"]
+          }
+        ],
+        "methods": [
+          {"name": "storage.bucket_acl.get",                "resources": ["BUCKET"]},
+          {"name": "storage.bucket_acl.list",               "resources": ["BUCKET"]},
+          {"name": "storage.buckets.delete",                "resources": ["BUCKET"]},
+          {"name": "storage.buckets.get",                   "resources": ["BUCKET"]},
+          {"name": "storage.buckets.getIamPolicy",          "resources": ["BUCKET"]},
+          {"name": "storage.buckets.insert",                "resources": []},
+          {"name": "storage.buckets.list",                  "resources": ["BUCKET"]},
+          {"name": "storage.buckets.lockRetentionPolicy",   "resources": ["BUCKET"]},
+          {"name": "storage.buckets.patch",                 "resources": ["BUCKET"]},
+          {"name": "storage.buckets.setIamPolicy",          "resources": ["BUCKET"]},
+          {"name": "storage.buckets.testIamPermissions",    "resources": ["BUCKET"]},
+          {"name": "storage.buckets.update",                "resources": ["BUCKET"]},
+          {"name": "storage.default_object_acl.get",        "resources": ["BUCKET"]},
+          {"name": "storage.default_object_acl.list",       "resources": ["BUCKET"]},
+          {"name": "storage.hmacKey.delete",                "resources": ["HMAC_KEY"]},
+          {"name": "storage.hmacKey.get",                   "resources": ["HMAC_KEY"]},
+          {"name": "storage.hmacKey.list",                  "resources": ["HMAC_KEY"]},
+          {"name": "storage.hmacKey.update",                "resources": ["HMAC_KEY"]},
+          {"name": "storage.notifications.delete",          "resources": ["BUCKET", "NOTIFICATION"]},
+          {"name": "storage.notifications.get",             "resources": ["BUCKET", "NOTIFICATION"]},
+          {"name": "storage.notifications.list",            "resources": ["BUCKET", "NOTIFICATION"]},
+          {"name": "storage.object_acl.get",                "resources": ["BUCKET", "OBJECT"]},
+          {"name": "storage.object_acl.list",               "resources": ["BUCKET", "OBJECT"]},
+          {"name": "storage.objects.compose",               "resources": ["BUCKET", "OBJECT"]},
+          {"name": "storage.objects.copy",                  "resources": ["BUCKET", "OBJECT"]},
+          {"name": "storage.objects.delete",                "resources": ["BUCKET", "OBJECT"]},
+          {"name": "storage.objects.get",                   "resources": ["BUCKET", "OBJECT"]},
+          {"name": "storage.objects.list",                  "resources": ["BUCKET", "OBJECT"]},
+          {"name": "storage.objects.insert",                "resources": ["BUCKET"]},
+          {"name": "storage.objects.patch",                 "resources": ["BUCKET", "OBJECT"]},
+          {"name": "storage.objects.rewrite",               "resources": ["BUCKET", "OBJECT"]},
+          {"name": "storage.objects.update",                "resources": ["BUCKET", "OBJECT"]},
+          {"name": "storage.serviceaccount.get",            "resources": []}
+        ],
+        "preconditionProvided": true,
+        "expectSuccess": false
       }
     ]
   }