Merge branch 'snapshot-api' of https://github.com/lebauce/aptly into lebauce-snapshot-api

Conflicts: api/router.go system/t12_api/__init__.py
2026-05-06 22:18:28 +00:00 · 2015-01-22 21:29:58 +03:00
parent c1fd633ed7 6a1a871dda
commit 7c3629337c
10 changed files with 768 additions and 78 deletions
@@ -47,6 +47,14 @@ class APITest(BaseTest):
            kwargs["headers"]["Content-Type"] = "application/json"
        return requests.post("http://%s%s" % (self.base_url, uri), *args, **kwargs)

+    def put(self, uri, *args, **kwargs):
+        if "json" in kwargs:
+            kwargs["data"] = json.dumps(kwargs.pop("json"))
+            if not "headers" in kwargs:
+                kwargs["headers"] = {}
+            kwargs["headers"]["Content-Type"] = "application/json"
+        return requests.put("http://%s%s" % (self.base_url, uri), *args, **kwargs)
+
    def delete(self, uri, *args, **kwargs):
        if "json" in kwargs:
            kwargs["data"] = json.dumps(kwargs.pop("json"))
@@ -267,6 +267,17 @@ class BaseTest(object):
        if a != b:
            self.verify_match(a, b, match_prepare=pprint.pformat)

+    def check_subset(self, a, b):
+        diff = ''
+        for k, v in a.items():
+            if k not in b:
+                diff += "unexpected key '%s'\n" % (k,)
+            elif b[k] != v:
+                diff += "wrong value '%s' for key '%s', expected '%s'\n" % (v, k, b[k])
+        if diff:
+            raise Exception("content doesn't match:\n" + diff)
+                            
+
    def verify_match(self, a, b, match_prepare=None):
        if match_prepare is not None:
            a = match_prepare(a)
@@ -7,3 +7,4 @@ from .files import *
 from .publish import *
 from .version import *
 from .graph import *
+from .snapshots import *
@@ -0,0 +1,179 @@
+from api_lib import APITest
+
+
+class SnapshotsAPITestCreateShow(APITest):
+    """
+    GET /api/snapshots/:name, POST /api/snapshots, GET /api/snapshots/:name/packages
+    """
+    def check(self):
+        snapshot_name = self.random_name()
+        snapshot_desc = {u'Description': u'fun snapshot',
+                         u'Name': snapshot_name}
+
+        resp = self.post("/api/snapshots", json=snapshot_desc)
+        self.check_subset(snapshot_desc, resp.json())
+        self.check_equal(resp.status_code, 201)
+
+        self.check_subset(snapshot_desc, self.get("/api/snapshots/" + snapshot_name).json())
+        self.check_equal(self.get("/api/snapshots/" + snapshot_name).status_code, 200)
+
+        self.check_equal(self.get("/api/snapshots/" + self.random_name()).status_code, 404)
+
+
+class SnapshotsAPITestCreateFromRefs(APITest):
+    """
+    GET /api/snapshots/:name, POST /api/snapshots, GET /api/snapshots/:name/packages
+    """
+    def check(self):
+        snapshot_name = self.random_name()
+        snapshot_desc = {u'Description': u'fun snapshot',
+                         u'Name': snapshot_name,
+                         u'SourceIDs': ['123']}
+
+        resp = self.post("/api/snapshots", json=snapshot_desc)
+        self.check_equal(resp.status_code, 404)
+
+        resp = self.post("/api/snapshots", json={"Name": self.random_name()})
+        self.check_equal(resp.status_code, 201)
+        snapshot_desc['SourceIDs'] = [resp.json()["UUID"]]
+
+        snapshot = snapshot_desc.copy()
+        snapshot['PackageRefs'] = ["Pi386 libboost-program-options-dev 1.49.0.1 918d2f433384e378"]
+        resp = self.post("/api/snapshots", json=snapshot)
+        self.check_equal(resp.status_code, 201)
+        self.check_subset(snapshot_desc, resp.json())
+
+        self.check_subset(snapshot_desc, self.get("/api/snapshots/" + snapshot_name).json())
+        self.check_equal(self.get("/api/snapshots/" + snapshot_name).status_code, 200)
+
+        self.check_equal(self.get("/api/snapshots/" + self.random_name()).status_code, 404)
+
+
+class SnapshotsAPITestCreateFromRepo(APITest):
+    """
+    POST /api/repos, POST /api/repos/:name/snapshots, GET /api/snapshots/:name
+    """
+    def check(self):
+        repo_name = self.random_name()
+        snapshot_name = self.random_name()
+        self.check_equal(self.post("/api/repos", json={"Name": repo_name}).status_code, 201)
+
+        resp = self.post("/api/repos/" + repo_name + '/snapshots', json={'Name': snapshot_name})
+        self.check_equal(resp.status_code, 400)
+
+        d = self.random_name()
+        self.check_equal(self.upload("/api/files/" + d, 
+                         "libboost-program-options-dev_1.49.0.1_i386.deb").status_code, 200)
+
+        self.check_equal(self.post("/api/repos/" + repo_name + "/file/" + d).status_code, 200)
+
+        resp = self.post("/api/repos/" + repo_name + '/snapshots', json={'Name': snapshot_name})
+        self.check_equal(self.get("/api/snapshots/" + snapshot_name).status_code, 200)
+
+        self.check_subset({u'Architecture': 'i386', u'Name': 'libboost-program-options-dev', u'Version': '1.49.0.1', 'FilesHash': '918d2f433384e378'},
+                          self.get("/api/snapshots/" + snapshot_name + "/packages?format=details").json()[0])
+
+        self.check_subset({u'Architecture': 'i386', u'Name': 'libboost-program-options-dev', u'Version': '1.49.0.1', 'FilesHash': '918d2f433384e378'},
+                          self.get("/api/snapshots/" + snapshot_name + "/packages?format=details", params={"q": "Version (> 0.6.1-1.4)"}).json()[0])
+
+
+class SnapshotsAPITestCreateUpdate(APITest):
+    """
+    POST /api/snapshots, PUT /api/snapshots/:name, GET /api/snapshots/:name
+    """
+    def check(self):
+        snapshot_name = self.random_name()
+        snapshot_desc = {u'Description': u'fun snapshot',
+                         u'Name': snapshot_name}
+
+        resp = self.post("/api/snapshots", json=snapshot_desc)
+        self.check_equal(resp.status_code, 201)
+
+        new_snapshot_name = self.random_name()
+        resp = self.put("/api/snapshots/" + snapshot_name, json={'Name': new_snapshot_name,
+                                                                 'Description': 'New description'})
+        self.check_equal(resp.status_code, 200)
+
+        resp = self.get("/api/snapshots/" + new_snapshot_name)
+        self.check_equal(resp.status_code, 200)
+        self.check_subset({"Name": new_snapshot_name,
+                           "Description": "New description"}, resp.json())
+
+
+class SnapshotsAPITestCreateDelete(APITest):
+    """
+    POST /api/snapshots, DELETE /api/snapshots/:name, GET /api/snapshots/:name
+    """
+    def check(self):
+        snapshot_name = self.random_name()
+        snapshot_desc = {u'Description': u'fun snapshot',
+                         u'Name': snapshot_name}
+
+        resp = self.post("/api/snapshots", json=snapshot_desc)
+        self.check_equal(resp.status_code, 201)
+
+        self.check_equal(self.delete("/api/snapshots/" + snapshot_name).status_code, 200)
+
+        self.check_equal(self.get("/api/snapshots/" + snapshot_name).status_code, 404)
+
+
+class SnapshotsAPITestSearch(APITest):
+    """
+    POST /api/snapshots, GET /api/snapshots?sort=name, GET /api/snapshots/:name
+    """
+    def check(self):
+
+        repo_name = self.random_name()
+        self.check_equal(self.post("/api/repos", json={"Name": repo_name}).status_code, 201)
+
+        d = self.random_name()
+        snapshot_name = self.random_name()
+        self.check_equal(self.upload("/api/files/" + d, 
+                         "libboost-program-options-dev_1.49.0.1_i386.deb").status_code, 200)
+
+        self.check_equal(self.post("/api/repos/" + repo_name + "/file/" + d).status_code, 200)
+
+        resp = self.post("/api/repos/" + repo_name + '/snapshots', json={'Name': snapshot_name})
+        self.check_equal(resp.status_code, 201)
+
+        resp = self.get("/api/snapshots/" + snapshot_name + "/packages?q=libboost-program-options-dev&format=details")
+        self.check_equal(resp.status_code, 200)
+
+        self.check_equal(len(resp.json()), 1)
+        self.check_equal(resp.json()[0]["Name"], "libboost-program-options-dev")
+
+        resp = self.get("/api/snapshots/" + snapshot_name + "/packages")
+        self.check_equal(resp.status_code, 200)
+
+        self.check_equal(len(resp.json()), 1)
+        self.check_equal(resp.json(), ["Pi386 libboost-program-options-dev 1.49.0.1 918d2f433384e378"])
+
+
+class SnapshotsAPITestDiff(APITest):
+    """
+    POST /api/snapshot/:name/diff/:name2
+    """
+    def check(self):
+        repos = [ self.random_name() for x in xrange(2) ]
+        snapshots = [ self.random_name() for x in xrange(2) ]
+
+        for repo_name in repos:
+            self.check_equal(self.post("/api/repos", json={"Name": repo_name}).status_code, 201)
+
+        d = self.random_name()
+        self.check_equal(self.upload("/api/files/" + d, 
+                         "libboost-program-options-dev_1.49.0.1_i386.deb").status_code, 200)
+
+        self.check_equal(self.post("/api/repos/" + repo_name + "/file/" + d).status_code, 200)
+
+        resp = self.post("/api/repos/" + repo_name + '/snapshots', json={'Name': snapshots[0]})
+        self.check_equal(resp.status_code, 201)
+
+        resp = self.post("/api/snapshots", json={'Name': snapshots[1]})
+        self.check_equal(resp.status_code, 201)
+
+        resp = self.post("/api/snapshots/" + snapshots[0] + "/diff/" + snapshots[1])
+
+        self.check_equal(resp.status_code, 200)
+        self.check_subset({"Right": None}, resp.json()[0])
+        self.check_subset({"Name": "libboost-program-options-dev"}, resp.json()[0]["Left"])