From edcceb60de06f3ea7d1177a4fa83f217d0968277 Mon Sep 17 00:00:00 2001 From: Sebastien Goasguen Date: Sun, 9 Sep 2012 10:48:42 +0530 Subject: [PATCH] Clean up docs in /tools/marvin: removed /docs and pointed to new wiki page in README --- tools/marvin/README | 17 ++++++++++------- tools/marvin/docs/tutorial.txt | 20 -------------------- 2 files changed, 10 insertions(+), 27 deletions(-) delete mode 100644 tools/marvin/docs/tutorial.txt diff --git a/tools/marvin/README b/tools/marvin/README index b225b6e93fc..785f078804b 100644 --- a/tools/marvin/README +++ b/tools/marvin/README @@ -2,14 +2,17 @@ Marvin is the testing framework for CloudStack written in python. Writing of unittests and functional tests with Marvin makes testing with cloudstack easier 1. INSTALL - untar Marvin-0.1.0.tar.gz - cd Marvin-0.1.0 - python setup.py install + untar Marvin-0.1.0.tar.gz + cd Marvin-0.1.0 + python setup.py install 2. Facility it provides: - 1. very handy cloudstack API python wrapper - 2. support async job executing in parallel - 3. remote ssh login/execute command - 4. mysql query + 1. very handy cloudstack API python wrapper + 2. support async job executing in parallel + 3. remote ssh login/execute command + 4. mysql query 3. sample code is under sandbox + +4. WIKI page + https://cwiki.apache.org/confluence/display/CLOUDSTACK/Testing+with+Python diff --git a/tools/marvin/docs/tutorial.txt b/tools/marvin/docs/tutorial.txt deleted file mode 100644 index a387e1b085e..00000000000 --- a/tools/marvin/docs/tutorial.txt +++ /dev/null @@ -1,20 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - - -Can be found at : http://wiki.cloudstack.org/display/QA/Testing+with+python