diff options
| author | Thomas Linford <tlinford@users.noreply.github.com> | 2022-02-27 22:05:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-27 22:05:37 +0100 |
| commit | 3765aa34830208a014ea9b50c59cac851dfe9b71 (patch) | |
| tree | ac136b3c58e73c86f33b2c5b94b2cbf29a92ef1a /src | |
| parent | docs(changelog): csi erase display fix (diff) | |
| download | sl0ppij-3765aa34830208a014ea9b50c59cac851dfe9b71.tar.gz sl0ppij-3765aa34830208a014ea9b50c59cac851dfe9b71.tar.xz sl0ppij-3765aa34830208a014ea9b50c59cac851dfe9b71.zip | |
fix(tests): ensure e2e tests use updated plugins (#1047)
* launch zellij with --data-dir flag in e2e tests, to avoid using prebuilt
plugins from assets dir, and instead use the ones from the docker
mount.
* make the tests use plugins built in release mode to avoid some test
failures due to timing issues.
* format Makefile.toml.
* set uid 1001 to in e2e action (thanks to https://github.com/francisfuzz/actions-uid-gid)
Diffstat (limited to 'src')
| -rw-r--r-- | src/tests/e2e/remote_runner.rs | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/tests/e2e/remote_runner.rs b/src/tests/e2e/remote_runner.rs index 9fe4cefd..4a7d7fbf 100644 --- a/src/tests/e2e/remote_runner.rs +++ b/src/tests/e2e/remote_runner.rs @@ -17,6 +17,7 @@ use std::rc::Rc; const ZELLIJ_EXECUTABLE_LOCATION: &str = "/usr/src/zellij/x86_64-unknown-linux-musl/release/zellij"; const ZELLIJ_LAYOUT_PATH: &str = "/usr/src/zellij/fixtures/layouts"; +const ZELLIJ_DATA_DIR: &str = "/usr/src/zellij/e2e-data"; const CONNECTION_STRING: &str = "127.0.0.1:2222"; const CONNECTION_USERNAME: &str = "test"; const CONNECTION_PASSWORD: &str = "test"; @@ -62,8 +63,8 @@ fn start_zellij(channel: &mut ssh2::Channel) { channel .write_all( format!( - "{} --session {}\n", - ZELLIJ_EXECUTABLE_LOCATION, SESSION_NAME + "{} --session {} --data-dir {}\n", + ZELLIJ_EXECUTABLE_LOCATION, SESSION_NAME, ZELLIJ_DATA_DIR ) .as_bytes(), ) @@ -76,8 +77,8 @@ fn start_zellij_mirrored_session(channel: &mut ssh2::Channel) { channel .write_all( format!( - "{} --session {} options --mirror-session true\n", - ZELLIJ_EXECUTABLE_LOCATION, SESSION_NAME + "{} --session {} --data-dir {} options --mirror-session true\n", + ZELLIJ_EXECUTABLE_LOCATION, SESSION_NAME, ZELLIJ_DATA_DIR ) .as_bytes(), ) @@ -90,8 +91,8 @@ fn start_zellij_in_session(channel: &mut ssh2::Channel, session_name: &str, mirr channel .write_all( format!( - "{} --session {} options --mirror-session {}\n", - ZELLIJ_EXECUTABLE_LOCATION, session_name, mirrored + "{} --session {} --data-dir {} options --mirror-session {}\n", + ZELLIJ_EXECUTABLE_LOCATION, session_name, ZELLIJ_DATA_DIR, mirrored ) .as_bytes(), ) @@ -111,8 +112,8 @@ fn start_zellij_without_frames(channel: &mut ssh2::Channel) { channel .write_all( format!( - "{} --session {} options --no-pane-frames\n", - ZELLIJ_EXECUTABLE_LOCATION, SESSION_NAME + "{} --session {} --data-dir {} options --no-pane-frames\n", + ZELLIJ_EXECUTABLE_LOCATION, SESSION_NAME, ZELLIJ_DATA_DIR ) .as_bytes(), ) @@ -125,8 +126,8 @@ fn start_zellij_with_layout(channel: &mut ssh2::Channel, layout_path: &str) { channel .write_all( format!( - "{} --layout-path {} --session {}\n", - ZELLIJ_EXECUTABLE_LOCATION, layout_path, SESSION_NAME + "{} --layout-path {} --session {} --data-dir {}\n", + ZELLIJ_EXECUTABLE_LOCATION, layout_path, SESSION_NAME, ZELLIJ_DATA_DIR ) .as_bytes(), ) |