From 770ac782a4be3f1edd2d427b1955aa6ca462b7dc Mon Sep 17 00:00:00 2001 From: "Michael J. Sullivan" Date: Mon, 24 Feb 2025 17:03:48 -0800 Subject: [PATCH] Rename the executable to gel (#1500) Let's see how much downstream devastation this causes. --- .github/workflows/tests.yml | 9 ++-- Cargo.toml | 2 +- tests/common/docker.rs | 6 +-- tests/docker_test_wrapper.rs | 3 +- tests/func/main.rs | 6 +-- tests/func/non_interactive.rs | 2 +- tests/github-actions/install.rs | 10 ++-- tests/github-nightly/common.rs | 6 ++- tests/portable_project.rs | 66 +++++++++++++------------- tests/portable_project_dir.rs | 50 ++++++++++---------- tests/portable_smoke.rs | 74 +++++++++++++++--------------- tests/shared-client-tests/build.rs | 2 +- 12 files changed, 119 insertions(+), 117 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ed6c8446..eb6636b9 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -76,7 +76,7 @@ jobs: - uses: actions/upload-artifact@v4 with: name: edgedb-linux-binary - path: target/x86_64-unknown-linux-musl/debug/edgedb + path: target/x86_64-unknown-linux-musl/debug/gel - name: Install EdgeDB uses: edgedb/setup-edgedb@v1 @@ -133,10 +133,11 @@ jobs: override: true - run: | - cargo build --workspace --test=${{ matrix.test }} --bin edgedb --features portable_tests + cargo build --workspace --test=${{ matrix.test }} --bin gel --features portable_tests - run: | - sudo cp target/debug/edgedb /usr/local/bin/ + sudo cp target/debug/gel /usr/local/bin/gel + sudo cp target/debug/gel /usr/local/bin/edgedb mkdir home_edgedb sudo mv home_edgedb /Users/edgedb @@ -155,7 +156,7 @@ jobs: fail-fast: false env: _EDGEDB_WSL_DISTRO: Debian - _EDGEDB_WSL_LINUX_BINARY: ./linux-binary/edgedb + _EDGEDB_WSL_LINUX_BINARY: ./linux-binary/gel steps: - uses: actions/checkout@v4 with: diff --git a/Cargo.toml b/Cargo.toml index c6985099..34aef671 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ authors = ["Gel Data Inc. "] edition = "2018" [[bin]] -name = "edgedb" +name = "gel" path = "src/main.rs" [features] diff --git a/tests/common/docker.rs b/tests/common/docker.rs index eeb108a5..b080d53d 100644 --- a/tests/common/docker.rs +++ b/tests/common/docker.rs @@ -102,10 +102,8 @@ impl Context { } pub fn add_bin(self) -> anyhow::Result { self.add_file_mode( - "edgedb", - fs::read( - env::var("EDGEDB_TEST_BIN_EXE").unwrap_or(env!("CARGO_BIN_EXE_edgedb").into()), - )?, + "gel", + fs::read(env::var("GEL_TEST_BIN_EXE").unwrap_or(env!("CARGO_BIN_EXE_gel").into()))?, 0o755, ) } diff --git a/tests/docker_test_wrapper.rs b/tests/docker_test_wrapper.rs index 128aeeb6..61241de2 100644 --- a/tests/docker_test_wrapper.rs +++ b/tests/docker_test_wrapper.rs @@ -100,7 +100,8 @@ fn dockerfile() -> String { --shell /bin/bash --ingroup users --gecos "Test User" \ user1 RUN mkdir /home/edgedb && chown user1 /home/edgedb - ADD ./edgedb /usr/bin/edgedb + ADD ./gel /usr/bin/edgedb + ADD ./gel /usr/bin/gel ADD ./tests /tests RUN chown -R user1 /tests/proj "### diff --git a/tests/func/main.rs b/tests/func/main.rs index f80834c9..e5753165 100644 --- a/tests/func/main.rs +++ b/tests/func/main.rs @@ -42,7 +42,7 @@ pub const BRANDING_CLI_CMD: &str = if cfg!(feature = "gel") { }; fn edgedb_cli_cmd() -> assert_cmd::Command { - let mut cmd = Command::cargo_bin("edgedb").expect("binary found"); + let mut cmd = Command::cargo_bin("gel").expect("binary found"); cmd.timeout(Duration::from_secs(60)); cmd.env("CLICOLOR", "0").arg("--no-cli-update-check"); cmd @@ -127,7 +127,7 @@ impl ServerGuard { use assert_cmd::cargo::CommandCargoExt; use rexpect::session::spawn_command; - let mut cmd = process::Command::cargo_bin("edgedb").expect("binary found"); + let mut cmd = process::Command::cargo_bin("gel").expect("binary found"); cmd.arg("--no-cli-update-check"); cmd.arg("--admin"); cmd.arg("--unix-path").arg(&self.0.info.socket_dir); @@ -142,7 +142,7 @@ impl ServerGuard { use assert_cmd::cargo::CommandCargoExt; use rexpect::session::spawn_command; - let mut cmd = process::Command::cargo_bin("edgedb").expect("binary found"); + let mut cmd = process::Command::cargo_bin("gel").expect("binary found"); cmd.arg("--no-cli-update-check"); cmd.arg("--admin"); cmd.arg("--unix-path").arg(&self.0.info.socket_dir); diff --git a/tests/func/non_interactive.rs b/tests/func/non_interactive.rs index 8582570d..c9dd65f4 100644 --- a/tests/func/non_interactive.rs +++ b/tests/func/non_interactive.rs @@ -35,7 +35,7 @@ fn stdin_password() { #[test] fn strict_version_check() { - Command::cargo_bin("edgedb") + Command::cargo_bin("gel") .expect("binary found") .env("EDGEDB_RUN_VERSION_CHECK", "strict") .arg("info") diff --git a/tests/github-actions/install.rs b/tests/github-actions/install.rs index a6984539..fc99b848 100644 --- a/tests/github-actions/install.rs +++ b/tests/github-actions/install.rs @@ -57,7 +57,7 @@ fn github_action_install() -> anyhow::Result<()> { .and(path(plat)) .and(path("edgedb-cli")) .and(warp::filters::path::end()) - .and(warp::fs::file(env!("CARGO_BIN_EXE_edgedb")))); + .and(warp::fs::file(env!("CARGO_BIN_EXE_gel")))); let certs_serv = certs.clone(); let server = async { @@ -78,8 +78,8 @@ fn github_action_install() -> anyhow::Result<()> { std::thread::sleep(std::time::Duration::new(10, 0)); if cfg!(windows) { - fs::copy(env!("CARGO_BIN_EXE_edgedb"), "edgedb-init.exe")?; - Command::new(".\\edgedb-init.exe") + fs::copy(env!("CARGO_BIN_EXE_gel"), "gel-init.exe")?; + Command::new(".\\gel-init.exe") .arg("-y") .assert() .context("edgedb-init", "self install by command name") @@ -107,9 +107,9 @@ fn github_action_install() -> anyhow::Result<()> { let bin_dir = dirs::executable_dir().unwrap_or(dirs::data_dir().unwrap().join("edgedb").join("bin")); let edgedb = if cfg!(windows) { - bin_dir.join("edgedb.exe") + bin_dir.join("gel.exe") } else { - bin_dir.join("edgedb") + bin_dir.join("gel") }; Command::new(&edgedb) diff --git a/tests/github-nightly/common.rs b/tests/github-nightly/common.rs index 6c3bf8d0..67af4cd8 100644 --- a/tests/github-nightly/common.rs +++ b/tests/github-nightly/common.rs @@ -37,7 +37,8 @@ pub fn dock_ubuntu(codename: &str) -> String { RUN adduser --uid 1000 --home /home/user1 \ --shell /bin/bash --ingroup users --gecos "Test User" \ user1 - ADD ./edgedb /usr/bin/edgedb + ADD ./gel /usr/bin/edgedb + ADD ./gel /usr/bin/gel ADD ./sudoers /etc/sudoers "###, codename = codename @@ -62,7 +63,8 @@ pub fn dock_debian(codename: &str) -> String { RUN adduser --uid 1000 --home /home/user1 \ --shell /bin/bash --ingroup users --gecos "Test User" \ user1 - ADD ./edgedb /usr/bin/edgedb + ADD ./gel /usr/bin/edgedb + ADD ./gel /usr/bin/gel ADD ./sudoers /etc/sudoers "###, codename = codename diff --git a/tests/portable_project.rs b/tests/portable_project.rs index dc08bb4d..bea87b43 100644 --- a/tests/portable_project.rs +++ b/tests/portable_project.rs @@ -9,21 +9,21 @@ use util::*; #[test] fn project_link_and_init() { - Command::new("edgedb") + Command::new("gel") .arg("--version") .assert() .context("version", "command-line version option") .success() .stdout(predicates::str::contains(EXPECTED_VERSION)); - Command::new("edgedb") + Command::new("gel") .arg("server") .arg("list-versions") .assert() .context("list-versions-before", "list with no installed") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("create") .arg("inst1") @@ -31,7 +31,7 @@ fn project_link_and_init() { .context("create-1", "created `inst1`") .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("info") .arg("--instance-name") @@ -41,7 +41,7 @@ fn project_link_and_init() { .code(1) .stderr(predicates::str::contains("is not initialized")); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("init") .arg("--link") @@ -52,7 +52,7 @@ fn project_link_and_init() { .context("project-link", "linked `inst1` to project project1") .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("info") .arg("--instance-name") @@ -62,7 +62,7 @@ fn project_link_and_init() { .success() .stdout(predicates::ord::eq("inst1\n")); - Command::new("edgedb") + Command::new("gel") .arg("query") .arg("SELECT 1") .current_dir("tests/proj/project1") @@ -70,7 +70,7 @@ fn project_link_and_init() { .context("query-1", "query of project") .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("init") .arg("--non-interactive") @@ -79,7 +79,7 @@ fn project_link_and_init() { .context("project-init", "init project2") .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("info") .arg("--instance-name") @@ -89,7 +89,7 @@ fn project_link_and_init() { .success() .stdout(predicates::ord::eq("project2\n")); - Command::new("edgedb") + Command::new("gel") .arg("query") .arg("SELECT 1") .current_dir("tests/proj/project2") @@ -97,7 +97,7 @@ fn project_link_and_init() { .context("query-2", "query of project2") .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("upgrade") .arg("--force") @@ -106,7 +106,7 @@ fn project_link_and_init() { .context("project-upgrade", "upgrade project") .success(); - Command::new("edgedb") + Command::new("gel") .arg("query") .arg("SELECT 1") .current_dir("tests/proj/project2") @@ -114,7 +114,7 @@ fn project_link_and_init() { .context("query-3", "query after upgrade") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("destroy") .arg("--instance=project2") @@ -123,7 +123,7 @@ fn project_link_and_init() { .context("destroy-2-no", "should warn") .code(2); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("destroy") .arg("--instance=inst1") @@ -132,7 +132,7 @@ fn project_link_and_init() { .context("destroy-1-no", "should warn") .code(2); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("destroy") .arg("--instance=project1") @@ -144,7 +144,7 @@ fn project_link_and_init() { ) .code(8); // instance not found - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("list") .assert() @@ -153,7 +153,7 @@ fn project_link_and_init() { .stdout(predicates::str::contains("inst1")) .stdout(predicates::str::contains("project2")); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("destroy") .arg("--instance=project2") @@ -162,7 +162,7 @@ fn project_link_and_init() { .context("destroy-2", "should destroy") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("list") .assert() @@ -171,7 +171,7 @@ fn project_link_and_init() { .stdout(predicates::str::contains("inst1")) .stdout(predicates::str::contains("project2").not()); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("unlink") .arg("-D") @@ -181,7 +181,7 @@ fn project_link_and_init() { .context("destroy-1", "should unlink and destroy project") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("list") .assert() @@ -190,7 +190,7 @@ fn project_link_and_init() { .stdout(predicates::str::contains("inst1").not()) .stdout(predicates::str::contains("project2").not()); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("init") .arg("--non-interactive") @@ -199,7 +199,7 @@ fn project_link_and_init() { .context("project-init-2", "init project2") .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("upgrade") .arg("--to-latest") @@ -209,7 +209,7 @@ fn project_link_and_init() { .context("project-upgrade-2", "upgrade project2") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("status") .arg("--instance=project2") @@ -218,7 +218,7 @@ fn project_link_and_init() { .context("instance-status", "show extended status") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("revert") .arg("--instance=project2") @@ -227,7 +227,7 @@ fn project_link_and_init() { .context("project-revert-2", "revert project2") .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("unlink") .arg("-D") @@ -246,14 +246,14 @@ fn hooks() { let branch_log_file = path::Path::new("tests/proj/project3/branch.log"); fs::remove_file(branch_log_file).ok(); - Command::new("edgedb") + Command::new("gel") .arg("--version") .assert() .context("version", "command-line version option") .success() .stdout(predicates::str::contains(EXPECTED_VERSION)); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("create") .arg("inst2") @@ -263,7 +263,7 @@ fn hooks() { .context("instance-create", "") .success(); - Command::new("edgedb") + Command::new("gel") .current_dir("tests/proj/project3") .arg("project") .arg("init") @@ -283,7 +283,7 @@ fn hooks() { ], }); - Command::new("edgedb") + Command::new("gel") .current_dir("tests/proj/project3") .arg("branch") .arg("switch") @@ -305,7 +305,7 @@ fn hooks() { let branch_log = fs::read_to_string(branch_log_file).unwrap(); assert_eq!(branch_log, "another\n"); - Command::new("edgedb") + Command::new("gel") .current_dir("tests/proj/project3") .arg("branch") .arg("merge") @@ -322,7 +322,7 @@ fn hooks() { ], }); - Command::new("edgedb") + Command::new("gel") .current_dir("tests/proj/project3") .arg("branch") .arg("wipe") @@ -340,7 +340,7 @@ fn hooks() { ], }); - Command::new("edgedb") + Command::new("gel") .current_dir("tests/proj/project3") .arg("branch") .arg("switch") @@ -363,7 +363,7 @@ fn hooks() { // branch switch, but with explict --instance arg // This should prevent hooks from being executed, since // this action is not executed "on a project", but "on an instance". - Command::new("edgedb") + Command::new("gel") .current_dir("tests/proj/project3") .arg("--instance=inst2") .arg("branch") diff --git a/tests/portable_project_dir.rs b/tests/portable_project_dir.rs index 4b397d83..57a2b208 100644 --- a/tests/portable_project_dir.rs +++ b/tests/portable_project_dir.rs @@ -9,21 +9,21 @@ use util::*; #[test] fn project_link_and_init_from_non_project_dir() { - Command::new("edgedb") + Command::new("gel") .arg("--version") .assert() .context("version", "command-line version option") .success() .stdout(predicates::str::contains(EXPECTED_VERSION)); - Command::new("edgedb") + Command::new("gel") .arg("server") .arg("list-versions") .assert() .context("list-versions-before", "list with no installed") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("create") .arg("inst1") @@ -31,7 +31,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-create-1", "created `inst1`") .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("info") .arg("--instance-name") @@ -41,7 +41,7 @@ fn project_link_and_init_from_non_project_dir() { .code(1) .stderr(predicates::str::contains("is not initialized")); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("init") .arg("--link") @@ -55,7 +55,7 @@ fn project_link_and_init_from_non_project_dir() { ) .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("info") .arg("--instance-name") @@ -65,7 +65,7 @@ fn project_link_and_init_from_non_project_dir() { .success() .stdout(predicates::ord::eq("inst1\n")); - Command::new("edgedb") + Command::new("gel") .arg("query") .arg("SELECT 1") .current_dir("tests/proj/project1") @@ -73,7 +73,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-query-1", "query of project") .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("init") .arg("--non-interactive") @@ -82,7 +82,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-project-init", "init project2") .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("info") .arg("--instance-name") @@ -92,7 +92,7 @@ fn project_link_and_init_from_non_project_dir() { .success() .stdout(predicates::ord::eq("project2\n")); - Command::new("edgedb") + Command::new("gel") .arg("query") .arg("SELECT 1") .current_dir("tests/proj/project2") @@ -100,7 +100,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-query-2", "query of project2") .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("upgrade") .arg("--force") @@ -109,7 +109,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-project-upgrade", "upgrade project") .success(); - Command::new("edgedb") + Command::new("gel") .arg("query") .arg("SELECT 1") .current_dir("tests/proj/project2") @@ -117,7 +117,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-query-3", "query after upgrade") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("destroy") .arg("--instance=project2") @@ -126,7 +126,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-destroy-2-no", "should warn") .code(2); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("destroy") .arg("--instance=inst1") @@ -135,7 +135,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-destroy-1-no", "should warn") .code(2); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("destroy") .arg("--instance=project1") @@ -147,7 +147,7 @@ fn project_link_and_init_from_non_project_dir() { ) .code(8); // instance not found - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("list") .assert() @@ -156,7 +156,7 @@ fn project_link_and_init_from_non_project_dir() { .stdout(predicates::str::contains("inst1")) .stdout(predicates::str::contains("project2")); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("destroy") .arg("--instance=project2") @@ -165,7 +165,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-destroy-2", "should destroy") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("list") .assert() @@ -174,7 +174,7 @@ fn project_link_and_init_from_non_project_dir() { .stdout(predicates::str::contains("inst1")) .stdout(predicates::str::contains("project2").not()); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("unlink") .arg("-D") @@ -184,7 +184,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-destroy-1", "should unlink and destroy project") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("list") .assert() @@ -193,7 +193,7 @@ fn project_link_and_init_from_non_project_dir() { .stdout(predicates::str::contains("inst1").not()) .stdout(predicates::str::contains("project2").not()); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("init") .arg("--non-interactive") @@ -202,7 +202,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-project-init-2", "init project2") .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("upgrade") .arg("--to-latest") @@ -212,7 +212,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-project-upgrade", "upgrade project2") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("status") .arg("--instance=project2") @@ -221,7 +221,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-instance-status", "show extended status") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("revert") .arg("--instance=project2") @@ -230,7 +230,7 @@ fn project_link_and_init_from_non_project_dir() { .context("proj-dir-project-revert-2", "revert project2") .success(); - Command::new("edgedb") + Command::new("gel") .arg("project") .arg("unlink") .arg("-D") diff --git a/tests/portable_smoke.rs b/tests/portable_smoke.rs index 4e017a3c..012403a3 100644 --- a/tests/portable_smoke.rs +++ b/tests/portable_smoke.rs @@ -9,7 +9,7 @@ use util::*; #[test] fn install() { - Command::new("edgedb") + Command::new("gel") .arg("--version") .assert() .context("version", "command-line version option") @@ -17,14 +17,14 @@ fn install() { .stdout(predicates::str::contains(EXPECTED_VERSION)); // TODO(tailhook) check output somehow - Command::new("edgedb") + Command::new("gel") .arg("server") .arg("list-versions") .assert() .context("list-versions", "list versions of the server") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("create") .arg("inst1") @@ -34,7 +34,7 @@ fn install() { .success(); // TODO(tailhook) check output somehow - Command::new("edgedb") + Command::new("gel") .arg("server") .arg("info") .arg("--latest") @@ -42,7 +42,7 @@ fn install() { .context("server-info", "show info about just installed server") .success(); - Command::new("edgedb") + Command::new("gel") .arg("server") .arg("info") .arg("--get") @@ -54,7 +54,7 @@ fn install() { .stdout(predicates::str::contains("edgedb-server")); // TODO check output somehow - Command::new("edgedb") + Command::new("gel") .arg("server") .arg("info") .arg("--get") @@ -65,7 +65,7 @@ fn install() { .success(); // TODO check output somehow - Command::new("edgedb") + Command::new("gel") .arg("server") .arg("info") .arg("--json") @@ -76,7 +76,7 @@ fn install() { .context("server-info", "show server version") .success(); - Command::new("edgedb") + Command::new("gel") .arg("server") .arg("list-versions") .arg("--installed-only") @@ -84,7 +84,7 @@ fn install() { .context("list-versions-installed", "") .success(); - Command::new("edgedb") + Command::new("gel") .arg("server") .arg("list-versions") .arg("--json") @@ -92,7 +92,7 @@ fn install() { .context("list-versions-json", "") .success(); - Command::new("edgedb") + Command::new("gel") .arg("server") .arg("list-versions") .arg("--json") @@ -101,7 +101,7 @@ fn install() { .context("list-versions-json-installed", "") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("logs") .arg("--instance=inst1") @@ -109,7 +109,7 @@ fn install() { .context("log-1-0", "logs of `inst1`") .success(); - Command::new("edgedb") + Command::new("gel") .arg("--instance") .arg("inst1") .arg("query") @@ -118,7 +118,7 @@ fn install() { .context("query-1", "query `inst1` first time") .success(); - Command::new("edgedb") + Command::new("gel") .arg("--instance") .arg("inst1") .arg("query") @@ -129,7 +129,7 @@ fn install() { .success() .stdout(predicates::str::contains("\"my-branch\"")); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("status") .arg("--instance=inst1") @@ -137,7 +137,7 @@ fn install() { .context("status-1", "status `inst1` first time") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("restart") .arg("--instance=inst1") @@ -145,7 +145,7 @@ fn install() { .context("restart-1", "restart `inst1`") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("logs") .arg("--instance=inst1") @@ -153,7 +153,7 @@ fn install() { .context("log-1-1", "logs of `inst1`") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("status") .arg("--instance=inst1") @@ -161,7 +161,7 @@ fn install() { .context("status-1-1", "status `inst1` after restart") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("stop") .arg("--instance=inst1") @@ -170,7 +170,7 @@ fn install() { .context("stop-1", "stop `inst1`") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("status") .arg("--instance=inst1") @@ -178,7 +178,7 @@ fn install() { .context("status-1-2", "status `inst1` after stop") .code(3); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("create") .arg("second") @@ -188,14 +188,14 @@ fn install() { .context("create-2", "create `second`") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("list") .assert() .context("instance-list-1", "list two instances") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("start") .arg("--instance=second") @@ -203,7 +203,7 @@ fn install() { .context("start-2", "start `second`") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("start") .arg("--instance=inst1") @@ -211,7 +211,7 @@ fn install() { .context("start-1-3", "start `inst1` again") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("status") .arg("--instance=second") @@ -219,7 +219,7 @@ fn install() { .context("status-2", "status `second`") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("logs") .arg("--instance=inst1") @@ -227,7 +227,7 @@ fn install() { .context("log-1-2", "logs of `inst1`") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("logs") .arg("--instance=second") @@ -235,7 +235,7 @@ fn install() { .context("log-2", "logs of `second`") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("status") .arg("--instance=inst1") @@ -244,7 +244,7 @@ fn install() { .success(); // minor upgrade - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("upgrade") .arg("--instance=inst1") @@ -253,7 +253,7 @@ fn install() { .context("upgrade-1", "force upgrade `inst1` to latest") .success(); - Command::new("edgedb") + Command::new("gel") .arg("--instance") .arg("inst1") .arg("query") @@ -263,7 +263,7 @@ fn install() { .success(); // major upgrade - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("upgrade") .arg("--instance=inst1") @@ -273,7 +273,7 @@ fn install() { .context("upgrade-2", "force upgrade `inst1` to latest") .success(); - Command::new("edgedb") + Command::new("gel") .arg("--instance") .arg("inst1") .arg("query") @@ -282,7 +282,7 @@ fn install() { .context("query-1-3", "query `inst1` after 2nd upgrade") .success(); - Command::new("edgedb") + Command::new("gel") .arg("--instance=second") .arg("extension") .arg("list") @@ -290,7 +290,7 @@ fn install() { .context("extension-list", "basic list of the installed extensions") .success(); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("destroy") .arg("second") @@ -302,7 +302,7 @@ fn install() { "positional argument has been removed", )); - Command::new("edgedb") + Command::new("gel") .arg("instance") .arg("destroy") .arg("--instance=second") @@ -311,7 +311,7 @@ fn install() { .context("destroy-2", "destroy `second` instance") .success(); - Command::new("edgedb") + Command::new("gel") .arg("server") .arg("uninstall") .arg("--unused") @@ -319,7 +319,7 @@ fn install() { .context("uninstall-2", "uninstall old version") .success(); - Command::new("edgedb") + Command::new("gel") .arg("server") .arg("list-versions") .arg("--installed-only") @@ -329,7 +329,7 @@ fn install() { .context("list-2", "list after uninstall") .stdout(predicates::str::contains("-dev.").not()); - Command::new("edgedb") + Command::new("gel") .arg("--instance") .arg("inst1") .arg("query") diff --git a/tests/shared-client-tests/build.rs b/tests/shared-client-tests/build.rs index 034a31be..bbd03323 100644 --- a/tests/shared-client-tests/build.rs +++ b/tests/shared-client-tests/build.rs @@ -352,7 +352,7 @@ fn {name}() {{ write!( testcase, r#" - Command::cargo_bin("edgedb").unwrap_or_else(|_| Command::new("edgedb")) + Command::cargo_bin("gel").unwrap_or_else(|_| Command::new("gel")) .arg("--no-cli-update-check") .arg("--test-output-conn-params")"#, );