You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/09/13 20:43:49 UTC
[21/50] [abbrv] git commit: Correcting two instances of wiki.c.o to
point to cwiki.a.o
Correcting two instances of wiki.c.o to point to cwiki.a.o
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2329ee14
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2329ee14
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2329ee14
Branch: refs/heads/javelin
Commit: 2329ee146a8bc9ead9974ac78365fab06c778888
Parents: a9559cb
Author: Sebastien Goasguen <ru...@gmail.com>
Authored: Thu Sep 13 19:34:46 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Thu Sep 13 19:35:53 2012 +0530
----------------------------------------------------------------------
test/integration/README | 10 ++--------
tools/marvin/marvin/sandbox/README.txt | 4 ++--
2 files changed, 4 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2329ee14/test/integration/README
----------------------------------------------------------------------
diff --git a/test/integration/README b/test/integration/README
index 24f6a88..e137a07 100644
--- a/test/integration/README
+++ b/test/integration/README
@@ -3,12 +3,6 @@ The tests are long running and are best monitored by external hudson jobs.
Also you will have to point marvin to the right configuration file that has
details about your cloudstack deployment. For more help on how to write the
-config file check the tutorial at :
+config file and run tests check the tutorial at :
-
-http://docs.cloudstack.org/test_framework_1.0
-
-http://wiki.cloudstack.org/display/QA/Testing+with+python
-
-To run:
-$ python -m marvin.deployAndRun -c config.cfg -d integration/smoke -t testcase.log -r result.log -l
+https://cwiki.apache.org/confluence/display/CLOUDSTACK/Testing+with+Python
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2329ee14/tools/marvin/marvin/sandbox/README.txt
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/sandbox/README.txt b/tools/marvin/marvin/sandbox/README.txt
index 55c5cd3..bb4d35e 100644
--- a/tools/marvin/marvin/sandbox/README.txt
+++ b/tools/marvin/marvin/sandbox/README.txt
@@ -15,8 +15,8 @@ those who have deployed CloudStack before. Once you have your properties file
you will have to create a JSON configuration of your deployment using the
python script provided in the respective folder.
-The demo files are from the tutorial for testing with python that can be found
-on the wiki.cloudstack.org
+The demo files are from the tutorial for testing with python that can be found at
+ https://cwiki.apache.org/confluence/display/CLOUDSTACK/Testing+with+Python
A common deployment model of a simulator.cfg that can be used for debugging is
included. This will configure an advanced zone with simulators that can be used