Fix Travis build, pytest was broken

zoe_client/configuration.py → common/configuration.py

@@ -2,9 +2,7 @@ from configparser import ConfigParser
 
 config_paths = [
     'zoe.conf',
-    'zoe-client.conf',
     '/etc/zoe/zoe.conf',
-    '/etc/zoe/zoe-client.conf'
 ]
 
 defaults = {
@@ -20,6 +18,16 @@ defaults = {
         'smtp_password': 'changeme',
         'cookie_secret': b"\xc3\xb0\xa7\xff\x8fH'\xf7m\x1c\xa2\x92F\x1d\xdcz\x05\xe6CJN5\x83!",
         'web_server_name': 'localhost'
+    },
+    'zoe_scheduler': {
+        'swarm_manager_url': 'tcp://swarm.example.com:2380',
+        'docker_private_registry': '10.1.0.1:5000',
+        'status_refresh_interval': 10,
+        'check_terminated_interval': 30,
+        'db_connect': 'mysql+mysqlconnector://zoe:pass@dbhost/zoe',
+        'ipc_listen_address': '127.0.0.1',
+        'ipc_listen_port': 8723,
+        'object_storage_url': 'http://127.0.0.1:4390'
     }
 }
 

zoe_client/zoe_storage_client.py → common/zoe_storage_client.py

@@ -3,7 +3,7 @@ import logging
 import requests
 import requests.exceptions
 
-from zoe_client.configuration import client_conf
+from common.configuration import client_conf
 
 log = logging.getLogger(__name__)
 

tests/conftest.py

+def pytest_addoption(parser):
+    parser.addoption("--test-environment", default="local", help="Test environment: 'local' or 'travis'")

zoe_client/client.py

@@ -6,7 +6,7 @@ from zoe_client.lib.ipc import ZoeIPCClient
 from zoe_client.scheduler_classes.execution import Execution
 from zoe_client.state import session
 from zoe_client.state.application import ApplicationState
-import zoe_client.zoe_storage_client as storage
+import common.zoe_storage_client as storage
 
 log = logging.getLogger(__name__)
 

zoe_client/entrypoint.py

@@ -6,7 +6,7 @@ from pprint import pprint
 import sys
 
 from zoe_client import ZoeClient
-from zoe_client.configuration import conf_init, client_conf
+from common.configuration import conf_init, client_conf
 from zoe_client.state import init as state_init, create_tables
 import zoe_client.users as users
 

zoe_storage_server/tests/conftest.py

@@ -5,10 +5,6 @@ import pytest
 from zoe_storage_server.configuration import conf_init
 
 
-def pytest_addoption(parser):
-    parser.addoption("--test-environment", default="local", help="Test environment: 'local' or 'travis'")
-
-
 @pytest.fixture(scope='session')
 def configuration(request):
     env = request.config.getoption("--test-environment")

zoe_web/api/__init__.py

@@ -4,7 +4,7 @@ from zipfile import is_zipfile
 from flask import Blueprint, jsonify, request, session, abort, send_file
 
 from zoe_client import ZoeClient
-from zoe_client.configuration import client_conf
+from common.configuration import client_conf
 
 api_bp = Blueprint('api', __name__)
 

zoe_web/entrypoint.py

@@ -6,7 +6,7 @@ from tornado.httpserver import HTTPServer
 from tornado.ioloop import IOLoop
 
 from zoe_web import app
-from zoe_client.configuration import conf_init, client_conf
+from common.configuration import conf_init, client_conf
 from zoe_client.state import init as state_init
 
 log = logging.getLogger("zoe_web")

zoe_web/web/applications.py

 from flask import render_template, url_for, redirect
 
 from zoe_client import ZoeClient
-from zoe_client.configuration import client_conf 
+from common.configuration import client_conf
 from zoe_web.web import web_bp
 import zoe_web.utils as web_utils
 

zoe_web/web/start.py

 from flask import render_template, redirect, url_for
 
 from zoe_client import ZoeClient
-from zoe_client.configuration import client_conf
+from common.configuration import client_conf
 from zoe_web.web import web_bp
 import zoe_web.utils as web_utils
 from zoe_client.scheduler_classes.execution import Execution

zoe_web/web/status.py

 from flask import render_template, redirect, url_for
 
 from zoe_client import ZoeClient
-from zoe_client.configuration import client_conf
+from common.configuration import client_conf
 from zoe_web.web import web_bp
 import zoe_web.utils as web_utils