x
/
solar
Code Issues Proposed changes

Fixed tests

This commit is contained in:
Evgeniy L 2015-05-29 13:37:05 +02:00
parent 2c6eda4ba1
commit 1ec2cfa968
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
requirements.txt
View File

@ -4,3 +4,4 @@ networkx==1.9.1
PyYAML==3.11 PyYAML==3.11
jsonschema==2.4.0 jsonschema==2.4.0
requests==2.7.0 requests==2.7.0
mock

2
solar/solar/core/resource.py
View File

@ -28,6 +28,7 @@ class Resource(object):
self.metadata = metadata self.metadata = metadata
self.actions = metadata['actions'].keys() if metadata['actions'] else None self.actions = metadata['actions'].keys() if metadata['actions'] else None
self.args = {} self.args = {}
for arg_name, arg_value in args.items(): for arg_name, arg_value in args.items():
if not self.metadata['input'].get(arg_name): if not self.metadata['input'].get(arg_name):
continue continue
@ -178,6 +179,7 @@ def assign_resources_to_nodes(resources, nodes):
signals.connect(created_node, created_resource) signals.connect(created_node, created_resource)
def connect_resources(profile): def connect_resources(profile):
connections = profile.get('connections', []) connections = profile.get('connections', [])
graph = ResourcesConnectionGraph(connections, load_all().values()) graph = ResourcesConnectionGraph(connections, load_all().values())

10
solar/solar/test/base.py
View File

@ -4,9 +4,11 @@ import tempfile
import unittest import unittest
import yaml import yaml
from solar.core import db
from solar.core import resource as xr from solar.core import resource as xr
from solar.core import signals as xs from solar.core import signals as xs
from solar.interfaces.db import get_db
db = get_db()
class BaseResourceTest(unittest.TestCase): class BaseResourceTest(unittest.TestCase):
@ -29,8 +31,4 @@ class BaseResourceTest(unittest.TestCase):
return path return path
def create_resource(self, name, src, args): def create_resource(self, name, src, args):
dst = os.path.join(self.storage_dir, 'rs', name) return xr.create(name, src, args)
os.makedirs(dst)
return xr.create(name, src, dst, args)