diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2023-12-12 17:18:40 +0100 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2023-12-12 17:18:40 +0100 |
| commit | 27adecb599ca509a65c15f94eb8775397e33a558 (patch) | |
| tree | 5f1d08acf188f54c8bdda08f4d1de665706bb197 | |
| parent | df07bc4148bcf9220f086c34082f18704695bf90 (diff) | |
| parent | 0018bdaf1dd5c067372ef2d015be31b636f10f05 (diff) | |
| download | mullvadvpn-27adecb599ca509a65c15f94eb8775397e33a558.tar.xz mullvadvpn-27adecb599ca509a65c15f94eb8775397e33a558.zip | |
Merge branch 'fix/missing-test-runner-binary-in-ci'
| -rwxr-xr-x | test/build.sh | 1 | ||||
| -rw-r--r-- | test/test-runner/src/sys.rs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/test/build.sh b/test/build.sh index 3c598ed4e7..133120e6f7 100755 --- a/test/build.sh +++ b/test/build.sh @@ -15,6 +15,7 @@ if [[ $TARGET == x86_64-unknown-linux-gnu ]]; then -v "${SCRIPT_DIR}/.container/cargo-registry":/root/.cargo/registry \ -v "${APP_DIR}":/src:Z \ -e CARGO_HOME=/root/.cargo/registry \ + -e CARGO_TARGET_DIR=/src/test/target \ mullvadvpn-app-tests \ /bin/bash -c "cd /src/test/; cargo build --bin test-runner --release --target ${TARGET}" else diff --git a/test/test-runner/src/sys.rs b/test/test-runner/src/sys.rs index 562c608120..7363e38e72 100644 --- a/test/test-runner/src/sys.rs +++ b/test/test-runner/src/sys.rs @@ -301,7 +301,7 @@ pub async fn stop_app() -> Result<(), test_rpc::Error> { /// This function waits for the app to successfully start again. #[cfg(target_os = "macos")] pub async fn start_app() -> Result<(), test_rpc::Error> { - set_launch_daemon_state(false).await?; + set_launch_daemon_state(true).await?; tokio::time::sleep(std::time::Duration::from_millis(1000)).await; Ok(()) } |