Commit faf5fc25 authored by Romain Courteaud's avatar Romain Courteaud

slapos_panel_ui_test: do not explicitely call alarms

rely on interaction workflow instead
parent 292ba646
...@@ -11,9 +11,13 @@ ...@@ -11,9 +11,13 @@
<value> <value>
<object> <object>
<klass> <klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> <global name="_reconstructor" module="copy_reg"/>
</klass> </klass>
<tuple/> <tuple>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
<global name="object" module="__builtin__"/>
<none/>
</tuple>
<state> <state>
<dictionary> <dictionary>
<item> <item>
......
...@@ -267,11 +267,7 @@ ...@@ -267,11 +267,7 @@
<td>javascript{selenium.browserbot.currentWindow.location.href}</td> <td>javascript{selenium.browserbot.currentWindow.location.href}</td>
<td>current_location</td> <td>current_location</td>
</tr> </tr>
<!-- run alarms multiple times, to detect unexpected side effects --> <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
<tal:block tal:repeat="step python: range(0, 3)">
<tal:block metal:use-macro="here/Zuite_SlapOSPanelTemplate/macros/activate_alarm" />
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
</tal:block>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${current_location}</td> <td>${current_location}</td>
......
...@@ -11,9 +11,13 @@ ...@@ -11,9 +11,13 @@
<value> <value>
<object> <object>
<klass> <klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> <global name="_reconstructor" module="copy_reg"/>
</klass> </klass>
<tuple/> <tuple>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
<global name="object" module="__builtin__"/>
<none/>
</tuple>
<state> <state>
<dictionary> <dictionary>
<item> <item>
......
...@@ -267,11 +267,8 @@ ...@@ -267,11 +267,8 @@
<td>javascript{selenium.browserbot.currentWindow.location.href}</td> <td>javascript{selenium.browserbot.currentWindow.location.href}</td>
<td>current_location</td> <td>current_location</td>
</tr> </tr>
<!-- run alarms multiple times, to detect unexpected side effects --> <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
<tal:block tal:repeat="step python: range(0, 3)">
<tal:block metal:use-macro="here/Zuite_SlapOSPanelTemplate/macros/activate_alarm" />
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
</tal:block>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${current_location}</td> <td>${current_location}</td>
......
...@@ -11,9 +11,13 @@ ...@@ -11,9 +11,13 @@
<value> <value>
<object> <object>
<klass> <klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/> <global name="_reconstructor" module="copy_reg"/>
</klass> </klass>
<tuple/> <tuple>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
<global name="object" module="__builtin__"/>
<none/>
</tuple>
<state> <state>
<dictionary> <dictionary>
<item> <item>
......
...@@ -442,11 +442,6 @@ ...@@ -442,11 +442,6 @@
<td colspan="3"><b>Trigger Upgrade Decision creation</b></td> <td colspan="3"><b>Trigger Upgrade Decision creation</b></td>
</tr> </tr>
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" /> <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
<tal:block metal:use-macro="here/Zuite_SlapOSPanelTemplate/macros/activate_alarm" />
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/web_site_module/slapos_master_panel/#?editable=1</td> <td>${base_url}/web_site_module/slapos_master_panel/#?editable=1</td>
......
...@@ -136,11 +136,9 @@ ...@@ -136,11 +136,9 @@
<td>current_location</td> <td>current_location</td>
</tr> </tr>
<!-- run alarms multiple times, to detect unexpected side effects --> <!-- run all alarms, to detect unexpected side effects -->
<tal:block tal:repeat="step python: range(0, 5)"> <tal:block metal:use-macro="here/Zuite_SlapOSPanelTemplate/macros/activate_alarm" />
<tal:block metal:use-macro="here/Zuite_SlapOSPanelTemplate/macros/activate_alarm" /> <tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/wait_for_activities" />
</tal:block>
<tr> <tr>
<td>open</td> <td>open</td>
......
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