Revert changes

misc/discoverynode/testing/e2e/test_local

@@ -1,20 +1,19 @@
 #!/bin/bash -e
-
+set -x
 ROOT_DIR=$(dirname $(realpath $0))
 
-export DN_SITE_PATH=$(realpath site_model)
-export DN_TARGET=$1
+export DN_SITE_PATH=$(realpath $1)
+export DN_TARGET=//mqtt/localhost
 
-if [[ -z $DN_TARGET ]]; then
-  echo "Usage $0 PROJECT_SPEC [TEST_REGEX]"
+if [[ -z $DN_SITE_PATH ]]; then
+  echo "Usage $0 SITE_PATH [TEST_REGEX]"
   exit 1
 fi
 
-if [[ -n $2 ]]; then
+if [[ $2 -ne "" ]]; then
   PYTEST_TARGET="-k $2"
 fi
 
-echo Building device and node containers...
 bash $ROOT_DIR/../docker/bacnet_device/build.sh
 bash $ROOT_DIR/../docker/discovery_node/build.sh
 

misc/discoverynode/testing/e2e/test_local.py

@@ -285,10 +285,10 @@ def test_sequencer(new_site_model, docker_devices, discovery_node):
   )
 
   result = run(
-      f"bin/sequencer -v {SITE_PATH} {TARGET} GAT-1 scan_single_future"
+      f"bin/sequencer -v {SITE_PATH} {TARGET} GAT-1 single_scan_future"
   )
 
-  assert "RESULT pass discovery.scan scan_single_future" in str(result.stdout), "result is pass (note this test can be flakey)"
+  assert "RESULT pass discovery.scan single_scan_future" in str(result.stdout), "result is pass (note this test can be flakey)"
 
 
 @pytest.fixture