From 20574d42247b20a4bc83e8697dcb6301c1b052c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Mon, 29 Oct 2012 11:28:56 +0100 Subject: [PATCH] Setup correct responsible. If no data are set the entry is provided by SlapOS Master. --- .../bt5/slapos_cloud/TestTemplateItem/testSlapOSSlapTool.py | 5 ++--- master/bt5/slapos_cloud/bt/revision | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/master/bt5/slapos_cloud/TestTemplateItem/testSlapOSSlapTool.py b/master/bt5/slapos_cloud/TestTemplateItem/testSlapOSSlapTool.py index b5cd5ae82..9b247b342 100644 --- a/master/bt5/slapos_cloud/TestTemplateItem/testSlapOSSlapTool.py +++ b/master/bt5/slapos_cloud/TestTemplateItem/testSlapOSSlapTool.py @@ -589,12 +589,11 @@ class TestSlapOSSlapToolComputerAccess(TestSlapOSSlapToolMixin): <string>text</string> <string>#error no data found for %(computer_id)s</string> <string>user</string> - <string>%(computer_id)s</string> + <string>SlapOS Master</string> </dictionary> </marshal> """ % dict( created_at=created_at, - computer_id=self.computer_id ) self.assertEqual(expected_xml, got_xml, '\n'.join([q for q in difflib.unified_diff(expected_xml.split('\n'), got_xml.split('\n'))])) @@ -821,7 +820,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): <string>text</string> <string>#error no data found for %(instance_guid)s</string> <string>user</string> - <string>%(instance_guid)s</string> + <string>SlapOS Master</string> </dictionary> </marshal> """ % dict( diff --git a/master/bt5/slapos_cloud/bt/revision b/master/bt5/slapos_cloud/bt/revision index 0973804c4..eafdfb06c 100644 --- a/master/bt5/slapos_cloud/bt/revision +++ b/master/bt5/slapos_cloud/bt/revision @@ -1 +1 @@ -137 \ No newline at end of file +138 \ No newline at end of file -- 2.30.9