Commit 11535a19 authored by Romain Courteaud's avatar Romain Courteaud

software/htmlvalidatorserver: restore the default software type

Keep compatibility with the default webrunner configuration.
parent 4fdd40d9
...@@ -26,4 +26,4 @@ md5sum = dc8b8d03b0af9cd32398d1fe86267bb7 ...@@ -26,4 +26,4 @@ md5sum = dc8b8d03b0af9cd32398d1fe86267bb7
[template] [template]
filename = instance.cfg.in filename = instance.cfg.in
md5sum = 94fc13254c819cba33b03f30251bc469 md5sum = c5b18ea5d353f96c41294541186f2528
...@@ -18,6 +18,7 @@ context = ...@@ -18,6 +18,7 @@ context =
[switch-softwaretype] [switch-softwaretype]
recipe = slapos.cookbook:switch-softwaretype recipe = slapos.cookbook:switch-softwaretype
RootSoftwareInstance = $${:validator} RootSoftwareInstance = $${:validator}
default = $${:validator}
validator = dynamic-template-validator:rendered validator = dynamic-template-validator:rendered
[slap-configuration] [slap-configuration]
......
...@@ -39,7 +39,6 @@ setUpModule, InstanceTestCase = makeModuleSetUpAndTestCaseClass( ...@@ -39,7 +39,6 @@ setUpModule, InstanceTestCase = makeModuleSetUpAndTestCaseClass(
class TestHtmlValidatorServer(InstanceTestCase): class TestHtmlValidatorServer(InstanceTestCase):
def test(self): def test(self):
parameter_dict = self.computer_partition.getConnectionParameterDict() parameter_dict = self.computer_partition.getConnectionParameterDict()
...@@ -68,3 +67,8 @@ class TestHtmlValidatorServer(InstanceTestCase): ...@@ -68,3 +67,8 @@ class TestHtmlValidatorServer(InstanceTestCase):
[httplib.UNAUTHORIZED, False], [httplib.UNAUTHORIZED, False],
[result.status_code, result.is_redirect] [result.status_code, result.is_redirect]
) )
class TestHtmlValidatorServerInsideWebRunner(TestHtmlValidatorServer):
@classmethod
def getInstanceSoftwareType(cls):
return 'default'
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