Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
Gelencsér Szabolcs
/
circlestack
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c7bbf883
authored
Feb 19, 2014
by
Bach Dániel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dashboard: fix tests
parent
eab17f86
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
10 deletions
+0
-10
circle/dashboard/fixtures/test-vm-fixture.json
+0
-1
circle/vm/models/instance.py
+0
-9
No files found.
circle/dashboard/fixtures/test-vm-fixture.json
View file @
c7bbf883
...
@@ -1462,7 +1462,6 @@
...
@@ -1462,7 +1462,6 @@
"modified"
:
"2014-01-24T00:58:19.654Z"
,
"modified"
:
"2014-01-24T00:58:19.654Z"
,
"system"
:
""
,
"system"
:
""
,
"priority"
:
20
,
"priority"
:
20
,
"state"
:
"READY"
,
"access_method"
:
"ssh"
,
"access_method"
:
"ssh"
,
"raw_data"
:
""
,
"raw_data"
:
""
,
"arch"
:
"x86_64"
,
"arch"
:
"x86_64"
,
...
...
circle/vm/models/instance.py
View file @
c7bbf883
...
@@ -456,15 +456,6 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
...
@@ -456,15 +456,6 @@ class Instance(AclBase, VirtualMachineDescModel, TimeStampedModel):
else
:
else
:
return
self
.
template
.
os_type
return
self
.
template
.
os_type
@property
def
system
(
self
):
"""Get the instance's operating system.
"""
if
self
.
template
is
None
:
return
_
(
"Unknown"
)
else
:
return
self
.
template
.
system
def
get_age
(
self
):
def
get_age
(
self
):
"""Deprecated. Use uptime instead.
"""Deprecated. Use uptime instead.
...
...
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