software/theia: Fix gravatar favicon for theia1

Ensure the gravatar favicon is different for each theia instance in a
resilient theia instance tree (theia0, theia1, ...).

This was broken by 0224b64f changing
a section name.

Add a test to detect future regressions.

software/theia/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = 9658a11340c018de816d0de40683706a
 
 [instance-import]
 _update_hash_filename_ = instance-import.cfg.jinja.in
-md5sum = c8d1be7aee980deb0f0d1a3126c9b9da
+md5sum = 262ae8a9858a674a0d9990cf4fd99498
 
 [instance-export]
 _update_hash_filename_ = instance-export.cfg.jinja.in

software/theia/instance-import.cfg.jinja.in

@@ -63,8 +63,8 @@ autorun = stopped
 
 
 # Change the gravatar favicon seed
-[favicon.ico]
-seed = Import {{ root_title }}
+[frontend-instance-favicon.ico]
+seed = {{ root_title }} {{ theia_id }}
 
 
 # The resilient stack calls post-notification-run:output followed by

software/theia/test/test.py

@@ -27,6 +27,7 @@
 from __future__ import unicode_literals
 
 import configparser
+import filecmp
 import json
 import logging
 import os
@@ -621,7 +622,11 @@ class ResilientTheiaMixin(object):
 
 
 class TestTheiaResilientInterface(ResilientTheiaMixin, TestTheia):
-  pass
+  def test_gravatar_favicon(self):
+    relpath = os.path.join('srv', 'frontend-static', 'favicon.ico')
+    theia0_favicon = self.getPartitionPath('export', relpath)
+    theia1_favicon = self.getPartitionPath('import', relpath)
+    self.assertFalse(filecmp.cmp(theia0_favicon, theia1_favicon, shallow=False))
 
 
 class TestTheiaResilientWithEmbeddedInstance(ResilientTheiaMixin, TestTheiaWithEmbeddedInstance):