diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-09-27 11:31:33 -0700 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2018-09-27 12:18:06 -0700 |
| commit | 13111e94c63f26b3234ae28ff46df3ce8392636d (patch) | |
| tree | a096f2d49dc381e2b282aad9dbbd9d5ff161eabd /tests/dcaegen2/testcases/resources | |
| parent | 9abb61ca2cea1907cab2cec312d6dca6e53a93cd (diff) | |
Adjust relative paths for CSIT files
Remove leading test/csit/ from all relative paths to
accomodate the move into integration/csit repo.
Change-Id: Id9482b46df839f5eba28135e9f987a3eda1d7d94
Issue-ID: INT-671
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Diffstat (limited to 'tests/dcaegen2/testcases/resources')
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/dcaegen2/testcases/resources/DcaeLibrary.py b/tests/dcaegen2/testcases/resources/DcaeLibrary.py index b43ee29e..d4188e30 100644 --- a/tests/dcaegen2/testcases/resources/DcaeLibrary.py +++ b/tests/dcaegen2/testcases/resources/DcaeLibrary.py @@ -74,13 +74,13 @@ class DcaeLibrary(object): client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) client.connect(os.environ['CSIT_IP'], port=22, username=os.environ['CSIT_USER'], password=os.environ['CSIT_PD']) - stdin, stdout, stderr = client.exec_command('%{WORKSPACE}/test/csit/tests/dcaegen2/testcases/resources/vesc_enable_https_auth.sh') + stdin, stdout, stderr = client.exec_command('%{WORKSPACE}/tests/dcaegen2/testcases/resources/vesc_enable_https_auth.sh') logger.console(stdout.read()) finally: client.close() return ws = os.environ['WORKSPACE'] - script2run = ws + "/test/csit/tests/dcaegen2/testcases/resources/vesc_enable_https_auth.sh" + script2run = ws + "/tests/dcaegen2/testcases/resources/vesc_enable_https_auth.sh" logger.info("Running script: " + script2run) logger.console("Running script: " + script2run) subprocess.call(script2run) diff --git a/tests/dcaegen2/testcases/resources/DcaeVariables.py b/tests/dcaegen2/testcases/resources/DcaeVariables.py index a9456d0f..ac1eb9f5 100644 --- a/tests/dcaegen2/testcases/resources/DcaeVariables.py +++ b/tests/dcaegen2/testcases/resources/DcaeVariables.py @@ -8,7 +8,7 @@ def get_environment_variable(env_varstr): DCAE_HEALTH_CHECK_URL = "http://135.205.228.129:8500" DCAE_HEALTH_CHECK_URL1 = "http://135.205.228.170:8500" -CommonEventSchemaV5 = get_environment_variable('WORKSPACE') + "/test/csit/tests/dcaegen2/testcases/assets/json_events/CommonEventFormat_28.3.json" +CommonEventSchemaV5 = get_environment_variable('WORKSPACE') + "/tests/dcaegen2/testcases/assets/json_events/CommonEventFormat_28.3.json" HttpServerThread = None HTTPD = None diff --git a/tests/dcaegen2/testcases/resources/dcae_keywords.robot b/tests/dcaegen2/testcases/resources/dcae_keywords.robot index 6820050f..013f6f03 100644 --- a/tests/dcaegen2/testcases/resources/dcae_keywords.robot +++ b/tests/dcaegen2/testcases/resources/dcae_keywords.robot @@ -8,7 +8,7 @@ Variables ../resources/DcaeVariables.py Resource ../resources/dcae_properties.robot *** Variables *** -${DCAE_HEALTH_CHECK_BODY} %{WORKSPACE}/test/csit/tests/dcae/testcases/assets/json_events/dcae_healthcheck.json +${DCAE_HEALTH_CHECK_BODY} %{WORKSPACE}/tests/dcae/testcases/assets/json_events/dcae_healthcheck.json *** Keywords *** Create sessions diff --git a/tests/dcaegen2/testcases/resources/vesc_enable_https_auth.sh b/tests/dcaegen2/testcases/resources/vesc_enable_https_auth.sh index 12989911..0755f077 100755 --- a/tests/dcaegen2/testcases/resources/vesc_enable_https_auth.sh +++ b/tests/dcaegen2/testcases/resources/vesc_enable_https_auth.sh @@ -16,7 +16,7 @@ docker exec -it vesc /opt/app/VESCollector/bin/VESrestfulCollector.sh stop sleep 2 -docker cp ${WORKSPACE}/test/csit/tests/dcaegen2/testcases/resources/collector.properties vesc:/opt/app/VESCollector/etc +docker cp ${WORKSPACE}/tests/dcaegen2/testcases/resources/collector.properties vesc:/opt/app/VESCollector/etc sleep 10 docker exec -id vesc /opt/app/VESCollector/bin/VESrestfulCollector.sh start sleep 5 |