Commit 0fedfa7a authored by Xavier Thompson's avatar Xavier Thompson

software/theia: Fix embedded instance tests

Since slapos.core!436 requesting with `--parameters-file` requires
that a JSON schema exists at <sr-url>.json for the requested SR.
parent 0ad34a5b
Pipeline #24607 failed with stage
# Bogus Software
A bogus non-SR that only has a JSON schema so that requesting it works.
{
"name": "Bogus",
"description": "Bogus",
"serialisation": "json-in-xml",
"software-type": {}
}
{
"name": "Dummy",
"description": "Dummy",
"serialisation": "xml",
"software-type": {}
}
...@@ -275,9 +275,9 @@ class TestTheiaEmbeddedSlapOSShutdown(TheiaTestCase): ...@@ -275,9 +275,9 @@ class TestTheiaEmbeddedSlapOSShutdown(TheiaTestCase):
class TestTheiaWithEmbeddedInstance(TheiaTestCase): class TestTheiaWithEmbeddedInstance(TheiaTestCase):
sr_url = '~/bogus/sr/url.cfg' sr_url = os.path.abspath('dummy/software.cfg')
sr_type = 'bogus-type' sr_type = 'dummy-type'
sr_config = {"bogus": "yes"} sr_config = {"dummy": "yes"}
regexpr = re.compile(r"([\w/\-\.]+)\s+slaprunner\s+available") regexpr = re.compile(r"([\w/\-\.]+)\s+slaprunner\s+available")
@classmethod @classmethod
...@@ -326,9 +326,9 @@ class TestTheiaWithEmbeddedInstance(TheiaTestCase): ...@@ -326,9 +326,9 @@ class TestTheiaWithEmbeddedInstance(TheiaTestCase):
self.assertEmbedded(initial_sr_url, self.sr_type, self.sr_config) self.assertEmbedded(initial_sr_url, self.sr_type, self.sr_config)
# Change parameters for embedded instance # Change parameters for embedded instance
sr_url = '/bogus/sr/url-2.cfg' sr_url = os.path.abspath('bogus/software.cfg')
sr_type = 'bogus-type-2' sr_type = 'bogus-type'
sr_config = {"bogus-2": "true"} sr_config = {"bogus": "true"}
self.requestInstance( self.requestInstance(
self.getInstanceParameterDict(sr_url, sr_type, sr_config)) self.getInstanceParameterDict(sr_url, sr_type, sr_config))
self.waitForInstance() self.waitForInstance()
......
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