Commit e1e4ed3f authored by Xavier Thompson's avatar Xavier Thompson

software/theia: Make each clone favicon different

Fix clone favicon being the same as the main instance favicon - this
is an uncaught regression. Add a test for it. Also give each clone a
different favicon, in case there are several clones.

See merge request !1637
parent 017a3e6d
Pipeline #36539 failed with stage
in 0 seconds
...@@ -23,7 +23,7 @@ md5sum = 9658a11340c018de816d0de40683706a ...@@ -23,7 +23,7 @@ md5sum = 9658a11340c018de816d0de40683706a
[instance-import] [instance-import]
_update_hash_filename_ = instance-import.cfg.jinja.in _update_hash_filename_ = instance-import.cfg.jinja.in
md5sum = d0ff7b93e392f9b9233f9ae6ba81583f md5sum = 647d99aa6f96b2515ac28013145fe81f
[instance-export] [instance-export]
_update_hash_filename_ = instance-export.cfg.jinja.in _update_hash_filename_ = instance-export.cfg.jinja.in
......
...@@ -67,8 +67,8 @@ autorun = stopped ...@@ -67,8 +67,8 @@ autorun = stopped
# Change the gravatar favicon seed # Change the gravatar favicon seed
[favicon.ico] [frontend-instance-favicon.ico]
seed = Import {{ root_title }} seed = {{ theia_id }} {{ root_title }}
# The resilient stack calls post-notification-run:output followed by # The resilient stack calls post-notification-run:output followed by
......
...@@ -650,6 +650,15 @@ class TestTheiaResilientInterface(ResilientTheiaMixin, TestTheia): ...@@ -650,6 +650,15 @@ class TestTheiaResilientInterface(ResilientTheiaMixin, TestTheia):
monitor_setup_params['password'], monitor_setup_params['password'],
)).raise_for_status() )).raise_for_status()
def test_all_favicon_are_different(self):
favicon_relpath = os.path.join('srv', 'frontend-static', 'favicon.ico')
with open(self.getPartitionPath('export', favicon_relpath), 'rb') as f:
export_favicon = f.read()
with open(self.getPartitionPath('import', favicon_relpath), 'rb') as f:
import_favicon = f.read()
if export_favicon == import_favicon:
self.fail('Import favicon and export favicon are not different')
class TestTheiaResilientWithEmbeddedInstance(ResilientTheiaMixin, TestTheiaWithEmbeddedInstance): class TestTheiaResilientWithEmbeddedInstance(ResilientTheiaMixin, TestTheiaWithEmbeddedInstance):
pass pass
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