From: Liang Ke <lokyse@163.com>
Date: Mon, 26 Mar 2018 08:57:48 +0000 (+0000)
Subject: Merge "Add test_call_req_success"
X-Git-Tag: v1.1.2~34
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=3566b3cb03fd2c6d255a0a3783834154cc5e4484;hp=0e1f816f012a92b6e2283bb300fbe1b054138941

Merge "Add test_call_req_success"
---

diff --git a/.gitignore b/.gitignore
index 9787425..a5beebe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .project
 .classpath
+.vscode
 .settings/
 .checkstyle
 target/
diff --git a/docs/MultCloud-Test-CSIT.rst b/docs/MultCloud-Test-CSIT.rst
new file mode 100644
index 0000000..63fd87f
--- /dev/null
+++ b/docs/MultCloud-Test-CSIT.rst
@@ -0,0 +1,18 @@
+Clone integration repo
+
+    git clone http://gerrit.onap.org/r/integration
+
+Setup more contains if needed
+
+The file 'setup.sh' under 'test/csit/plans/multicloud/functionality1' will setup multicloud containers for CSIT test.
+Add more tests
+
+The file 'testplan.txt' under 'test/csit/plans/multicloud/functionality1/' specific the robot tests to be run.
+
+The content of 'testplan.txt' will looks like following:
+
+    # Test suites are relative paths under [integration.git]/test/csit/tests/.
+    # Place the suites in run order.
+    multicloud/provision/sanity_test_multivim.robot
+
+When adding tests to file 'multicloud/provision/sanity_test_multivim.robot' , a 'verify-csit' job will be trigger for related patch, and related change will be tested.
diff --git a/multivimbroker/multivimbroker/tests/test_restcall.py b/multivimbroker/multivimbroker/tests/test_restcall.py
index 2052208..8ac1948 100644
--- a/multivimbroker/multivimbroker/tests/test_restcall.py
+++ b/multivimbroker/multivimbroker/tests/test_restcall.py
@@ -18,8 +18,8 @@ class TestRestCall(unittest.TestCase):
 
     def test_combine_url(self):
         url = ["http://a.com/test/", "http://a.com/test/",
-               "http://a.com/test"]
-        res = ["/resource", "resource", "/resource"]
+               "http://a.com/test", "http://a.com/test"]
+        res = ["/resource", "resource", "/resource", "resource"]
         expected = "http://a.com/test/resource"
         for i in range(len(url)):
             self.assertEqual(expected, restcall.combine_url(url[i], res[i]))