summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtest/functest/scripts/start-simulators.sh4
-rw-r--r--test/functest/simulators/has-api/response-payloads/flow1-success-simple/main.json2
-rw-r--r--test/functest/simulators/has-api/response-payloads/flow1-success-simple/status-solving.json2
-rwxr-xr-xtest/functest/simulators/simulated-config/osdf_config.yaml4
-rw-r--r--tox.ini1
5 files changed, 7 insertions, 6 deletions
diff --git a/test/functest/scripts/start-simulators.sh b/test/functest/scripts/start-simulators.sh
index b8b5719..a3f3db1 100755
--- a/test/functest/scripts/start-simulators.sh
+++ b/test/functest/scripts/start-simulators.sh
@@ -42,8 +42,8 @@ SIMULATORS_DIR=$FUNC_TEST_DIR/simulators
XPID=$(ps -x | grep "python oof_dependencies_simulators.py" | grep -v grep | awk '{print $1}')
echo "simulator pid " $XPID
if [ -z "$XPID" ]; then
- python oof_dependencies_simulators.py & # > simulator-logs 2>&1 &
- sleep 20
+ python oof_dependencies_simulators.py > simulator-logs 2>&1 &
+ sleep 10
fi
)
diff --git a/test/functest/simulators/has-api/response-payloads/flow1-success-simple/main.json b/test/functest/simulators/has-api/response-payloads/flow1-success-simple/main.json
index a56840a..0d375c1 100644
--- a/test/functest/simulators/has-api/response-payloads/flow1-success-simple/main.json
+++ b/test/functest/simulators/has-api/response-payloads/flow1-success-simple/main.json
@@ -4,7 +4,7 @@
"links": [
[
{
- "href": "http://localhost:5000/simulated/oof/has-api/flow1-success-simple/status-solving.json",
+ "href": "http://127.0.0.1:5000/simulated/oof/has-api/flow1-success-simple/status-solving.json",
"rel": "self"
}
]
diff --git a/test/functest/simulators/has-api/response-payloads/flow1-success-simple/status-solving.json b/test/functest/simulators/has-api/response-payloads/flow1-success-simple/status-solving.json
index 8bb074f..2bdbfe8 100644
--- a/test/functest/simulators/has-api/response-payloads/flow1-success-simple/status-solving.json
+++ b/test/functest/simulators/has-api/response-payloads/flow1-success-simple/status-solving.json
@@ -6,7 +6,7 @@
"links": [
[
{
- "href": "http://localhost:5000/simulated/oof/has-api/flow1-success-simple/status-done.json",
+ "href": "http://127.0.0.1:5000/simulated/oof/has-api/flow1-success-simple/status-done.json",
"rel": "self"
}
]
diff --git a/test/functest/simulators/simulated-config/osdf_config.yaml b/test/functest/simulators/simulated-config/osdf_config.yaml
index a192b70..0a77fe2 100755
--- a/test/functest/simulators/simulated-config/osdf_config.yaml
+++ b/test/functest/simulators/simulated-config/osdf_config.yaml
@@ -5,14 +5,14 @@ odfPasswordForSO: "" # The OSDF Manager password for MSO.
soUsername: "" # SO username for call back.
soPassword: "" # SO password for call back.
-conductorUrl: "http://localhost:5000/simulated/oof/has-api/flow1-success-simple/main.json"
+conductorUrl: "http://127.0.0.1:5000/simulated/oof/has-api/flow1-success-simple/main.json"
conductorUsername: "CONDUCTOR-USER"
conductorPassword: "CONDUCTOR-PASSWD"
conductorPingWaitTime: 2 # seconds to wait before calling the conductor retry URL
conductorMaxRetries: 5 # if we don't get something in 30 minutes, give up
# Policy Platform -- requires ClientAuth, Authorization, and Environment
-policyPlatformUrl: http://localhost:5001/simulated/policy/pdp-has-vcpe-good/pdp/getConfig # Policy Dev platform URL
+policyPlatformUrl: http://127.0.0.1:5001/simulated/policy/pdp-has-vcpe-good/pdp/getConfig # Policy Dev platform URL
policyPlatformEnv: TEST # Environment for policy platform
policyPlatformUsername: POLICY-USER # Policy platform username.
policyPlatformPassword: POLICY-PASSWD # Policy platform password.
diff --git a/tox.ini b/tox.ini
index 18be307..88b595d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,7 @@ envlist = py3
[testenv]
distribute = False
commands =
+ - cat /etc/hosts
/bin/bash test/functest/scripts/start-simulators.sh
coverage run --module pytest --junitxml xunit-results.xml
coverage xml --omit=".tox/py3/*","test/*"