Use checkout on 5.2, normalise http-examples [7xx]

base.cfg

@@ -34,6 +34,10 @@ allow-hosts =
     code.google.com
     robotframework.googlecode.com
 
+[versions]
+# Do not use a release of plone.restapi:
+plone.restapi =
+
 [instance]
 recipe = plone.recipe.zope2instance
 user = admin:admin
@@ -70,7 +74,6 @@ initialization =
     # necessary to explicitly call time.tzset().
     import time
     time.tzset()
-    os.environ['ZSERVER_PORT'] = '55001'
 defaults = ['-s', 'plone.restapi', '--auto-color', '--auto-progress']
 
 [coverage]

buildout.cfg

@@ -1,12 +1,2 @@
 [buildout]
 extends = plone-5.2.x.cfg
-versions=versions
-
-[versions]
-plone.restapi =
-
-plone.schema = 1.3.0
-plone.dexterity = 2.9.8
-
-# 3.0 drops python2 compatibility
-pyroma = 2.6.1

news/1213.bugfix

@@ -0,0 +1,3 @@
+Fix testing of a checkout instead of a released package.
+Normalize the http-examples.
+[maurits]

plone-4.3.x.cfg

@@ -1,7 +1,7 @@
 [buildout]
 extends =
-    base.cfg
     https://dist.plone.org/release/4.3.20/versions.cfg
+    base.cfg
     versions.cfg
 
 [versions]
@@ -29,9 +29,6 @@ pyrsistent = 0.15.7
 # Error: The requirement ('distlib<1,>=0.3.1') is not allowed by your [versions] constraint (0.3.0)
 distlib = 0.3.1
 
-# plone.restapi specific pins
-plone.restapi =
-
 # Improvements to the JSONField
 plone.schema = 1.3.0
 

plone-5.0.x.cfg

@@ -1,11 +1,10 @@
 [buildout]
 extends =
-    base.cfg
     http://dist.plone.org/release/5.0.10/versions.cfg
+    base.cfg
     versions.cfg
 
 [versions]
-plone.restapi =
 plone.schema = 1.2.1
 pytz = 2017.3
 zope.interface = 4.1.0

plone-5.1.x.cfg

@@ -1,7 +1,7 @@
 [buildout]
 extends =
-    base.cfg
     https://dist.plone.org/release/5.1.7/versions.cfg
+    base.cfg
     versions.cfg
 
 [versions]
@@ -34,8 +34,5 @@ Jinja2 = 2.10
 Babel = 2.5.1
 astunparse = 1.6.2
 
-# plone.restapi specific pins
-plone.restapi =
-
 # Improvements to the JSONField
 plone.schema = 1.3.0

plone-5.2.x-performance.cfg

@@ -26,6 +26,3 @@ profiles =
     plone.app.contenttypes:plone-content
     plone.restapi:performance
 site-replace = True
-
-[versions]
-plone.restapi =

plone-5.2.x.cfg

@@ -1,7 +1,7 @@
 [buildout]
 extends =
+    https://dist.plone.org/release/5.2.5/versions.cfg
     base.cfg
-    https://dist.plone.org/release/5.2.4/versions.cfg
 find-links += https://dist.plone.org/thirdparty/
 versions=versions
 
@@ -11,19 +11,5 @@ black = 20.8b1
 # Error: The requirement ('virtualenv>=20.0.35') is not allowed by your [versions] constraint (20.0.26)
 virtualenv = 20.0.35
 
-# Error: The requirement ('pep517>=0.9') is not allowed by your [versions] constraint (0.8.2)
-pep517 = 0.9.1
-
 # Error: The requirement ('importlib-metadata>=1') is not allowed by your [versions] constraint (0.23)
 importlib-metadata = 2.0.0
-
-# cryptography 3.4 requires a rust compiler installed on the system:
-# https://github.com/pyca/cryptography/blob/master/CHANGELOG.rst#34---2021-02-07
-cryptography = 3.3.2
-
-# cffi 1.14.3 fails on apple m1
-cffi = 1.14.4
-
-# requirement for json widget tests to pass
-plone.schema = 1.3.0
-plone.dexterity = 2.9.8

src/plone/restapi/tests/http-examples/404_not_found.resp

@@ -2,6 +2,6 @@ HTTP/1.1 404 Not Found
 Content-Type: application/json
 
 {
-  "message": "Resource not found: http://localhost:55001/plone/non-existing-resource",
-  "type": "NotFound"
-}
+    "message": "Resource not found: http://localhost:55001/plone/non-existing-resource",
+    "type": "NotFound"
+}

src/plone/restapi/tests/http-examples/batching.resp

@@ -2,49 +2,49 @@ HTTP/1.1 200 OK
 Content-Type: application/json
 
 {
-  "@id": "http://localhost:55001/plone/folder/@search", 
-  "batching": {
-    "@id": "http://localhost:55001/plone/folder/@search?b_size=5&sort_on=path", 
-    "first": "http://localhost:55001/plone/folder/@search?b_start=0&b_size=5&sort_on=path", 
-    "last": "http://localhost:55001/plone/folder/@search?b_start=5&b_size=5&sort_on=path", 
-    "next": "http://localhost:55001/plone/folder/@search?b_start=5&b_size=5&sort_on=path"
-  }, 
-  "items": [
-    {
-      "@id": "http://localhost:55001/plone/folder", 
-      "@type": "Folder", 
-      "description": "", 
-      "review_state": "private", 
-      "title": "Folder"
-    }, 
-    {
-      "@id": "http://localhost:55001/plone/folder/doc-1", 
-      "@type": "Document", 
-      "description": "", 
-      "review_state": "private", 
-      "title": "Document 1"
-    }, 
-    {
-      "@id": "http://localhost:55001/plone/folder/doc-2", 
-      "@type": "Document", 
-      "description": "", 
-      "review_state": "private", 
-      "title": "Document 2"
-    }, 
-    {
-      "@id": "http://localhost:55001/plone/folder/doc-3", 
-      "@type": "Document", 
-      "description": "", 
-      "review_state": "private", 
-      "title": "Document 3"
-    }, 
-    {
-      "@id": "http://localhost:55001/plone/folder/doc-4", 
-      "@type": "Document", 
-      "description": "", 
-      "review_state": "private", 
-      "title": "Document 4"
-    }
-  ], 
-  "items_total": 8
-}
+    "@id": "http://localhost:55001/plone/folder/@search",
+    "batching": {
+        "@id": "http://localhost:55001/plone/folder/@search?b_size=5&sort_on=path",
+        "first": "http://localhost:55001/plone/folder/@search?b_start=0&b_size=5&sort_on=path",
+        "last": "http://localhost:55001/plone/folder/@search?b_start=5&b_size=5&sort_on=path",
+        "next": "http://localhost:55001/plone/folder/@search?b_start=5&b_size=5&sort_on=path"
+    },
+    "items": [
+        {
+            "@id": "http://localhost:55001/plone/folder",
+            "@type": "Folder",
+            "description": "",
+            "review_state": "private",
+            "title": "Folder"
+        },
+        {
+            "@id": "http://localhost:55001/plone/folder/doc-1",
+            "@type": "Document",
+            "description": "",
+            "review_state": "private",
+            "title": "Document 1"
+        },
+        {
+            "@id": "http://localhost:55001/plone/folder/doc-2",
+            "@type": "Document",
+            "description": "",
+            "review_state": "private",
+            "title": "Document 2"
+        },
+        {
+            "@id": "http://localhost:55001/plone/folder/doc-3",
+            "@type": "Document",
+            "description": "",
+            "review_state": "private",
+            "title": "Document 3"
+        },
+        {
+            "@id": "http://localhost:55001/plone/folder/doc-4",
+            "@type": "Document",
+            "description": "",
+            "review_state": "private",
+            "title": "Document 4"
+        }
+    ],
+    "items_total": 8
+}

src/plone/restapi/tests/http-examples/breadcrumbs.resp

@@ -2,12 +2,12 @@ HTTP/1.1 200 OK
 Content-Type: application/json
 
 {
-  "@id": "http://localhost:55001/plone/front-page/@breadcrumbs", 
-  "items": [
-    {
-      "@id": "http://localhost:55001/plone/front-page", 
-      "title": "Welcome to Plone"
-    }
-  ], 
-  "root": "http://localhost:55001/plone"
-}
+    "@id": "http://localhost:55001/plone/front-page/@breadcrumbs",
+    "items": [
+        {
+            "@id": "http://localhost:55001/plone/front-page",
+            "title": "Welcome to Plone"
+        }
+    ],
+    "root": "http://localhost:55001/plone"
+}