Commit 6db3c559 authored by Romain Courteaud's avatar Romain Courteaud

client: test: drop getJIOAPIUrl

parent 837eb523
...@@ -664,8 +664,6 @@ class ComputerForTest(object): ...@@ -664,8 +664,6 @@ class ComputerForTest(object):
if req.method == 'GET': if req.method == 'GET':
if url.path == "/getHateoasUrl": if url.path == "/getHateoasUrl":
return "" return ""
elif url.path == "/getJIOAPIUrl":
return "https://127.0.0.1/api/"
raise ValueError("Unexcepted call to API. URL:%s Content:%s" % (url.path, req.body)) raise ValueError("Unexcepted call to API. URL:%s Content:%s" % (url.path, req.body))
def getTestSoftwareClass(self): def getTestSoftwareClass(self):
......
...@@ -874,7 +874,6 @@ exit 1 ...@@ -874,7 +874,6 @@ exit 1
'/getComputerPartitionCertificate', '/getComputerPartitionCertificate',
'/startedComputerPartition', '/startedComputerPartition',
'/getHateoasUrl', '/getHateoasUrl',
'/getJIOAPIUrl',
'/getFullComputerInformation', '/getFullComputerInformation',
'/getComputerPartitionCertificate', '/getComputerPartitionCertificate',
'/softwareInstanceError']) '/softwareInstanceError'])
...@@ -934,7 +933,6 @@ chmod 755 etc/run/wrapper ...@@ -934,7 +933,6 @@ chmod 755 etc/run/wrapper
self.assertLogContent(wrapper_log, 'Signal handler called with signal 15') self.assertLogContent(wrapper_log, 'Signal handler called with signal 15')
self.assertEqual(computer.sequence, self.assertEqual(computer.sequence,
['/getHateoasUrl', ['/getHateoasUrl',
'/getJIOAPIUrl',
'/getFullComputerInformation', '/getFullComputerInformation',
'/getComputerPartitionCertificate', '/getComputerPartitionCertificate',
'/stoppedComputerPartition']) '/stoppedComputerPartition'])
...@@ -1004,7 +1002,6 @@ exit 1 ...@@ -1004,7 +1002,6 @@ exit 1
self.assertLogContent(wrapper_log, 'Signal handler called with signal 15') self.assertLogContent(wrapper_log, 'Signal handler called with signal 15')
self.assertEqual(computer.sequence, self.assertEqual(computer.sequence,
['/getHateoasUrl', ['/getHateoasUrl',
'/getJIOAPIUrl',
'/getFullComputerInformation', '/getFullComputerInformation',
'/getComputerPartitionCertificate', '/getComputerPartitionCertificate',
'/softwareInstanceError']) '/softwareInstanceError'])
...@@ -1048,7 +1045,6 @@ exit 1 ...@@ -1048,7 +1045,6 @@ exit 1
self.assertLogContent(wrapper_log, 'Working') self.assertLogContent(wrapper_log, 'Working')
self.assertEqual(computer.sequence, self.assertEqual(computer.sequence,
['/getHateoasUrl', ['/getHateoasUrl',
'/getJIOAPIUrl',
'/getFullComputerInformation', '/getFullComputerInformation',
'/getComputerPartitionCertificate', '/getComputerPartitionCertificate',
'/startedComputerPartition']) '/startedComputerPartition'])
...@@ -1534,17 +1530,14 @@ class TestSlapgridCPPartitionProcessing(MasterMixin, unittest.TestCase): ...@@ -1534,17 +1530,14 @@ class TestSlapgridCPPartitionProcessing(MasterMixin, unittest.TestCase):
self.assertEqual(self.launchSlapgrid(), slapgrid.SLAPGRID_SUCCESS) self.assertEqual(self.launchSlapgrid(), slapgrid.SLAPGRID_SUCCESS)
self.assertEqual(computer.sequence, self.assertEqual(computer.sequence,
['/getHateoasUrl', ['/getHateoasUrl',
'/getJIOAPIUrl',
'/getFullComputerInformation', '/getFullComputerInformation',
'/getComputerPartitionCertificate', '/getComputerPartitionCertificate',
'/stoppedComputerPartition', '/stoppedComputerPartition',
'/getHateoasUrl', '/getHateoasUrl',
'/getJIOAPIUrl',
'/getFullComputerInformation', '/getFullComputerInformation',
'/getComputerPartitionCertificate', '/getComputerPartitionCertificate',
'/stoppedComputerPartition', '/stoppedComputerPartition',
'/getHateoasUrl', '/getHateoasUrl',
'/getJIOAPIUrl',
'/getFullComputerInformation']) '/getFullComputerInformation'])
def test_partition_timestamp_no_timestamp(self): def test_partition_timestamp_no_timestamp(self):
...@@ -1566,12 +1559,10 @@ class TestSlapgridCPPartitionProcessing(MasterMixin, unittest.TestCase): ...@@ -1566,12 +1559,10 @@ class TestSlapgridCPPartitionProcessing(MasterMixin, unittest.TestCase):
self.launchSlapgrid() self.launchSlapgrid()
self.assertEqual(computer.sequence, self.assertEqual(computer.sequence,
['/getHateoasUrl', ['/getHateoasUrl',
'/getJIOAPIUrl',
'/getFullComputerInformation', '/getFullComputerInformation',
'/getComputerPartitionCertificate', '/getComputerPartitionCertificate',
'/stoppedComputerPartition', '/stoppedComputerPartition',
'/getHateoasUrl', '/getHateoasUrl',
'/getJIOAPIUrl',
'/getFullComputerInformation', '/getFullComputerInformation',
'/getComputerPartitionCertificate', '/getComputerPartitionCertificate',
'/stoppedComputerPartition']) '/stoppedComputerPartition'])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment