fixup! runner: opening Software Release supplies a new one, instead of destroying all data

slapos/resiliencytest/suites/slaprunner.py

@@ -229,10 +229,10 @@ class SlaprunnerTestSuite(ResiliencyTestSuite):
   def _openSoftwareRelease(self, software_release='erp5testnode/testsuite/dummy'):
     self.logger.debug('Opening %s software release...' % software_release)
     data = self._connectToSlaprunner(
-        resource='setCurrentProject',
+        resource='supplySoftwareRelease',
         data='path=workspace/slapos/software/%s/' % software_release
     )
-    assert json.loads(data)['code'] != 0, 'Unexpecting result in call to setCurrentProject: %s' % data
+    assert json.loads(data)['code'] != 0, 'Unexpecting result in call to supplySoftwareRelease: %s' % data
 
   def generateData(self):
     """

slapos/runner/runnertest.py

@@ -327,7 +327,7 @@ setuptools = 33.1.1
     """Scenario 3: Open software release"""
     self.test_cloneProject()
     software = os.path.join(self.software, 'helloworld')  # Drupal SR must exist in SR folder
-    response = loadJson(self.app.post('/setCurrentProject',
+    response = loadJson(self.app.post('/supplySoftwareRelease',
                                       data=dict(path=software),
                                       follow_redirects=True))
     self.assertEqual(response['result'], "")
@@ -378,7 +378,7 @@ setuptools = 33.1.1
     self.setupTestSoftware()
     #Set current projet and run Slapgrid-cp
     software = self.software + 'slaprunner-test/'
-    response = loadJson(self.app.post('/setCurrentProject',
+    response = loadJson(self.app.post('/supplySoftwareRelease',
                                       data=dict(path=software),
                                       follow_redirects=True))
     self.assertEqual(response['result'], "")
@@ -567,7 +567,7 @@ setuptools = 33.1.1
                                       ),
                                       follow_redirects=True)).get(u'code')
     self.assertEqual(response, 1)
-    response = loadJson(self.app.post('/setCurrentProject',
+    response = loadJson(self.app.post('/supplySoftwareRelease',
                                       data=dict(path=software),
                                       follow_redirects=True)).get(u'code')
     self.assertEqual(response, 1)

slapos/runner/static/js/scripts/inspectSoftware.js

@@ -27,7 +27,7 @@ $(document).ready(function () {
         }
         $.ajax({
             type: "POST",
-            url: $SCRIPT_ROOT + '/setCurrentProject',
+            url: $SCRIPT_ROOT + '/supplySoftwareRelease',
             data: "path=" + elt.attr('rel'),
             success: function (data) {
                 if (data.code === 1) {

slapos/runner/views.py

@@ -322,11 +322,6 @@ def checkFolder():
   return checkSoftwareFolder(request.form['path'], app.config)
 
 
-def setCurrentProject():
-  logger.warn('setCurrentProject is deprecated')
-  return supplySoftwareRelease()
-
-
 def supplySoftwareRelease():
   if request.form['path']:
     sr_absolute_path = realpath(app.config, request.form['path'])
@@ -890,8 +885,6 @@ app.add_url_rule("/getProjectStatus", 'getProjectStatus', getProjectStatus,
                  methods=['POST'])
 app.add_url_rule('/openProject/<method>', 'openProject', openProject,
                  methods=['GET'])
-app.add_url_rule("/setCurrentProject", 'setCurrentProject', setCurrentProject,
-                 methods=['POST'])
 app.add_url_rule("/supplySoftwareRelease", 'supplySoftwareRelease', supplySoftwareRelease,
                  methods=['POST'])
 app.add_url_rule("/checkFolder", 'checkFolder', checkFolder, methods=['POST'])