Fixes tests.

This commit is contained in:
grossmj committed 2015-03-14 13:16:27 -06:00
1 parent 25b778aec0
commit 6d56da03e5
8 files changed
+53 -46

No files matched your search

+5 -4
View File
@@ -345,6 +345,10 @@ class IOUVM(BaseVM):
Checks for a valid IOU key in the iourc file (paranoid mode).
"""
license_check = self._manager.config.get_section_config("IOU").getboolean("license_check", False)
if license_check:
return
config = configparser.ConfigParser()
try:
with open(self.iourc_path) as f:
@@ -401,10 +405,7 @@ class IOUVM(BaseVM):
if iourc_path and not os.path.isfile(iourc_path):
raise IOUError("A valid iourc file is necessary to start IOU")
license_check = self._manager.config.get_section_config("IOU").getboolean("license_check", False)
if license_check:
yield from self._check_iou_licence()
yield from self._check_iou_licence()
iouyap_path = self.iouyap_path
if not iouyap_path or not os.path.isfile(iouyap_path):
raise IOUError("iouyap is necessary to start IOU")
@@ -155,7 +155,8 @@ class VirtualBoxVM(BaseVM):
yield from self.set_adapters(self._adapters)
vm_info = yield from self._get_vm_info()
self._ram = int(vm_info["memory"])
if "memory" in vm_info:
self._ram = int(vm_info["memory"])
@asyncio.coroutine
def start(self):
+1 -1
View File
@@ -53,7 +53,7 @@ PROJECT_UPDATE_SCHEMA = {
"properties": {
"name": {
"description": "Project name",
"type": "string",
"type": ["string", "null"],
"minLength": 1
},
"temporary": {