Noam Slomianko has uploaded a new change for review. Change subject: Add make file ......................................................................
Add make file Added a make file with start/stop/test options Signed-off-by: Noam Slomianko <[email protected]> Change-Id: I34e025773eb92865c770adf164c20d3b907e84d1 --- M Makefile M src/oschedproxyd.py M tests/java/src/main/java/org/ovirt/schedulerproxy/SchedulerProxy.java 3 files changed, 9 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-scheduler-proxy refs/changes/24/17424/1 diff --git a/Makefile b/Makefile index 9a999e8..fa5b3d9 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,13 @@ all: test pep8 -PYTHONPATH=src - test: - PYTHONPATH=$(PYTHONPATH) nosetests -v + make start + cd tests/java && mvn clean install + make stop pep8: pep8 src +start: + python src/oschedproxyd.py & +stop: + pkill -f "python src/oschedproxyd.py" diff --git a/src/oschedproxyd.py b/src/oschedproxyd.py old mode 100644 new mode 100755 index b0996c1..5328f07 --- a/src/oschedproxyd.py +++ b/src/oschedproxyd.py @@ -72,8 +72,8 @@ # TODO make by config logging.info("Loading modules") self._handler = RequestHandler( - os.path.join(os.getcwd() + '/../', "plugins"), - os.getcwd() + os.path.join(os.getcwd() + "/plugins"), + os.getcwd() + "/src" ) def run(self): diff --git a/tests/java/src/main/java/org/ovirt/schedulerproxy/SchedulerProxy.java b/tests/java/src/main/java/org/ovirt/schedulerproxy/SchedulerProxy.java index 3292cc1..aafd219 100644 --- a/tests/java/src/main/java/org/ovirt/schedulerproxy/SchedulerProxy.java +++ b/tests/java/src/main/java/org/ovirt/schedulerproxy/SchedulerProxy.java @@ -8,7 +8,6 @@ import org.apache.xmlrpc.XmlRpcException; import org.apache.xmlrpc.client.XmlRpcClient; import org.apache.xmlrpc.client.XmlRpcClientConfigImpl; -import org.ovirt.engine.api.model.Hosts; public class SchedulerProxy { final XmlRpcClient client; -- To view, visit http://gerrit.ovirt.org/17424 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I34e025773eb92865c770adf164c20d3b907e84d1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-scheduler-proxy Gerrit-Branch: master Gerrit-Owner: Noam Slomianko <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
