Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksey Lim <alsroot@sugarlabs.org>2014-05-09 03:45:01 (GMT)
committer Aleksey Lim <alsroot@sugarlabs.org>2014-05-09 03:45:01 (GMT)
commitfbfc90eae2909a640dfee17715f39234522ea3bf (patch)
treea445789992bc59da2283116b9621e94f5afddd37
parent644f9bc5d7591cb678361709809cefd3931b01fc (diff)
Rename resolve API command to more appropriate clone
-rw-r--r--sugar_network/node/routes.py4
-rwxr-xr-xtests/units/node/node_routes.py4
2 files changed, 4 insertions, 4 deletions
diff --git a/sugar_network/node/routes.py b/sugar_network/node/routes.py
index 79c4056..45e6e20 100644
--- a/sugar_network/node/routes.py
+++ b/sugar_network/node/routes.py
@@ -174,9 +174,9 @@ class NodeRoutes(db.Routes, FrontRoutes):
enforce(solution is not None, 'Failed to solve')
return solution
- @route('GET', ['context', None], cmd='resolve',
+ @route('GET', ['context', None], cmd='clone',
arguments={'requires': list, 'stability': list, 'assume': list})
- def resolve(self, assume=None):
+ def clone(self, assume=None):
solution = self.solve(assume)
return self.volume.blobs.get(solution[this.request.guid]['blob'])
diff --git a/tests/units/node/node_routes.py b/tests/units/node/node_routes.py
index bd29a57..719bae2 100755
--- a/tests/units/node/node_routes.py
+++ b/tests/units/node/node_routes.py
@@ -758,7 +758,7 @@ class NodeRoutesTest(tests.Test):
conn.get(['context', 'activity'], cmd='solve',
stability='developer', lsb_id='Ubuntu', lsb_release='10.04', requires=['dep', 'package']))
- def test_Resolve(self):
+ def test_Clone(self):
volume = self.start_master()
conn = Connection()
@@ -795,7 +795,7 @@ class NodeRoutesTest(tests.Test):
conn.put(['context', 'package', 'releases', '*'], {'binary': ['package.bin']})
response = Response()
- reply = conn.call(Request(method='GET', path=['context', 'activity'], cmd='resolve'), response)
+ reply = conn.call(Request(method='GET', path=['context', 'activity'], cmd='clone'), response)
assert activity_blob == reply.read()
def test_AggpropInsertAccess(self):