Merge pull request #3729 from royalpeasantry/develop

Loosen requirements for ID field in PROJECT_PRIVATE_RE.
boto · May 13, 2017 · 5e85d7c · 5e85d7c
2 parents 315b76e + 6e9f6d0
commit 5e85d7c
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/tests/integration/gs/test_basic.py b/tests/integration/gs/test_basic.py
@@ -75,13 +75,13 @@
 
 # Regexp for matching project-private default object ACL.
 PROJECT_PRIVATE_RE = ('\s*<AccessControlList>\s*<Entries>\s*<Entry>'
-  '\s*<Scope type="GroupById">\s*<ID>[0-9a-fA-F]+</ID>'
+  '\s*<Scope type="GroupById">\s*<ID>[-a-zA-Z0-9]+</ID>'
   '\s*(<Name>[^<]+</Name>)?\s*</Scope>'
   '\s*<Permission>FULL_CONTROL</Permission>\s*</Entry>\s*<Entry>'
-  '\s*<Scope type="GroupById">\s*<ID>[0-9a-fA-F]+</ID>'
+  '\s*<Scope type="GroupById">\s*<ID>[-a-zA-Z0-9]+</ID>'
   '\s*(<Name>[^<]+</Name>)?\s*</Scope>'
   '\s*<Permission>FULL_CONTROL</Permission>\s*</Entry>\s*<Entry>'
-  '\s*<Scope type="GroupById">\s*<ID>[0-9a-fA-F]+</ID>'
+  '\s*<Scope type="GroupById">\s*<ID>[-a-zA-Z0-9]+</ID>'
   '\s*(<Name>[^<]+</Name>)?\s*</Scope>'
   '\s*<Permission>READ</Permission>\s*</Entry>\s*</Entries>'
   '\s*</AccessControlList>\s*')