Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xavier Thompson
erp5
Commits
09a020d8
Commit
09a020d8
authored
Aug 29, 2013
by
Benjamin Blanc
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tetnode: correct datetime library usage
parent
37bd2c21
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
erp5/util/testnode/ScalabilityTestRunner.py
erp5/util/testnode/ScalabilityTestRunner.py
+3
-3
No files found.
erp5/util/testnode/ScalabilityTestRunner.py
View file @
09a020d8
...
@@ -114,7 +114,7 @@ class ScalabilityTestRunner():
...
@@ -114,7 +114,7 @@ class ScalabilityTestRunner():
instance_title
=
"Scalability-"
instance_title
=
"Scalability-"
instance_title
+=
"("
+
test_suite_title
+
")-"
instance_title
+=
"("
+
test_suite_title
+
")-"
instance_title
+=
str
(
self
.
involved_nodes_computer_guid
).
replace
(
"'"
,
""
)
instance_title
+=
str
(
self
.
involved_nodes_computer_guid
).
replace
(
"'"
,
""
)
instance_title
+=
"-"
+
str
(
datetime
.
now
().
isoformat
())
+
"-"
instance_title
+=
"-"
+
str
(
datetime
.
datetime
.
now
().
isoformat
())
+
"-"
instance_title
+=
"timestamp="
+
str
(
time
.
time
())
instance_title
+=
"timestamp="
+
str
(
time
.
time
())
return
instance_title
return
instance_title
...
@@ -450,7 +450,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
...
@@ -450,7 +450,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
# Get title and link list of all instances
# Get title and link list of all instances
instance_dict
=
self
.
slapos_communicator
.
getHostingSubscriptionDict
()
instance_dict
=
self
.
slapos_communicator
.
getHostingSubscriptionDict
()
instance_to_delete_list
=
[]
instance_to_delete_list
=
[]
outdated_date
=
datetime
.
fromtimestamp
(
time
.
time
())
-
datetime
.
timedelta
(
days
=
2
)
outdated_date
=
datetime
.
datetime
.
fromtimestamp
(
time
.
time
())
-
datetime
.
timedelta
(
days
=
2
)
# Select instances to delete
# Select instances to delete
for
title
,
link
in
instance_dict
.
items
():
for
title
,
link
in
instance_dict
.
items
():
# Instances created by testnode contains "Scalability-" and
# Instances created by testnode contains "Scalability-" and
...
@@ -458,7 +458,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
...
@@ -458,7 +458,7 @@ late a SlapOS (positive) answer." %(str(os.getpid()),str(os.getpid()),))
if
"Scalability-"
in
title
and
"timestamp="
in
title
:
if
"Scalability-"
in
title
and
"timestamp="
in
title
:
# Get timestamp of the instance creation date
# Get timestamp of the instance creation date
foo
,
timestamp
=
title
.
split
(
"timestamp="
)
foo
,
timestamp
=
title
.
split
(
"timestamp="
)
creation_date
=
datetime
.
fromtimestamp
(
float
(
timestamp
))
creation_date
=
datetime
.
datetime
.
fromtimestamp
(
float
(
timestamp
))
# Test if instance is older than the limit
# Test if instance is older than the limit
if
creation_date
<
outdated_date
:
if
creation_date
<
outdated_date
:
instance_to_delete_list
.
append
((
title
,
link
))
instance_to_delete_list
.
append
((
title
,
link
))
...
...
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