Commit 722ecd22 authored by Xavier Thompson's avatar Xavier Thompson

Theia frontend custom

See merge request nexedi/slapos!981
parents 12eab3c1 e63c9c59
Pipeline #15527 failed with stage
...@@ -13,9 +13,13 @@ ...@@ -13,9 +13,13 @@
# section inheritance (< = ...) are NOT supported (but you should really # section inheritance (< = ...) are NOT supported (but you should really
# not need these here). # not need these here).
[instance-theia]
filename = instance-theia.cfg.jinja.in
md5sum = 65c66a4cc4eb1d074dcafddf945a34d4
[instance] [instance]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = bfd488ba023f505be25d947ec830bab3 md5sum = 43923e3e1f27c43696ecbca9ee147bdb
[yarn.lock] [yarn.lock]
filename = yarn.lock filename = yarn.lock
......
This diff is collapsed.
This diff is collapsed.
...@@ -22,6 +22,7 @@ extends = ...@@ -22,6 +22,7 @@ extends =
parts = parts =
theia-wrapper theia-wrapper
slapos-cookbook slapos-cookbook
instance-theia
instance instance
# default for slapos-standalone # default for slapos-standalone
...@@ -323,6 +324,10 @@ template = ...@@ -323,6 +324,10 @@ template =
#!/bin/sh #!/bin/sh
exec ${nodejs:location}/bin/node ${theia:location}/node_modules/.bin/theia-open "$@" exec ${nodejs:location}/bin/node ${theia:location}/node_modules/.bin/theia-open "$@"
[instance-theia]
<= template-base
output = ${buildout:directory}/instance-theia.cfg.jinja
[instance] [instance]
<= template-base <= template-base
output = ${buildout:directory}/instance.cfg output = ${buildout:directory}/instance.cfg
...@@ -247,6 +247,22 @@ class TestTheiaWithSR(TheiaTestCase): ...@@ -247,6 +247,22 @@ class TestTheiaWithSR(TheiaTestCase):
self.assertIsNotNone(re.search(r"%s\s+%s\s+%s" % (self.sr_url, self.sr_type, instance_name), info), info) self.assertIsNotNone(re.search(r"%s\s+%s\s+%s" % (self.sr_url, self.sr_type, instance_name), info), info)
class TestTheiaFrontend(TheiaTestCase):
@classmethod
def getInstanceParameterDict(cls):
return {
'additional-frontend-guid': 'SOMETHING'
}
def setUp(self):
self.connection_parameters = self.computer_partition.getConnectionParameterDict()
def test_http_get(self):
for key in ('url', 'additional-url'):
resp = requests.get(self.connection_parameters[key], verify=False)
self.assertEqual(requests.codes.unauthorized, resp.status_code)
class TestTheiaEnv(TheiaTestCase): class TestTheiaEnv(TheiaTestCase):
dummy_software_path = os.path.abspath('dummy/software.cfg') dummy_software_path = os.path.abspath('dummy/software.cfg')
......
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