Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Fukász Rómeó Ervin
/
cloud
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
530fd2ed
authored
Apr 05, 2015
by
Csók Tamás
Committed by
Bach Dániel
Apr 10, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
selenium: changed line order error
parent
52f2a704
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
circle/dashboard/tests/selenium/util.py
+5
-3
No files found.
circle/dashboard/tests/selenium/util.py
View file @
530fd2ed
...
...
@@ -286,11 +286,11 @@ class CircleSeleniumMixin(SeleniumMixin):
def
save_template_from_vm
(
self
,
name
):
try
:
url_save
=
self
.
get_url
()
WebDriverWait
(
self
.
driver
,
self
.
conf
.
wait_max_sec
)
.
until
(
ec
.
element_to_be_clickable
((
By
.
CSS_SELECTOR
,
"a[href$='/op/deploy/']"
)))
url_save
=
self
.
get_url
()
self
.
click_on_link
(
self
.
get_link_by_href
(
"/op/deploy/"
))
fallback_url
=
"
%
sop/deploy/"
%
url_save
self
.
wait_and_accept_operation
(
...
...
@@ -625,7 +625,8 @@ class CircleSeleniumMixin(SeleniumMixin):
recent_remove_disk
=
self
.
recently
(
self
.
get_timeline_elements
(
"vm.Instance.remove_disk"
,
url_save
))
if
not
self
.
check_operation_result
(
recent_remove_disk
):
if
not
self
.
check_operation_result
(
recent_remove_disk
,
"a[href*='#activity']"
):
logger
.
warning
(
"Selenium cannot delete disk "
"of the chosen template"
)
raise
Exception
(
'Cannot delete disk'
)
...
...
@@ -738,7 +739,8 @@ class CircleSeleniumMixin(SeleniumMixin):
recent_destroy_vm
=
self
.
recently
(
self
.
get_timeline_elements
(
"vm.Instance.destroy"
,
url_save
))
if
not
self
.
check_operation_result
(
recent_destroy_vm
):
if
not
self
.
check_operation_result
(
recent_destroy_vm
,
"a[href*='#activity']"
):
logger
.
warning
(
"Selenium cannot destroy "
"the chosen
%(id)
s vm"
%
{
'id'
:
pk
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment