diff --git a/tests/fixtures/linux/linux.json b/tests/fixtures/linux/linux.json index ad285084e..062dec3cc 100644 --- a/tests/fixtures/linux/linux.json +++ b/tests/fixtures/linux/linux.json @@ -367,6 +367,23 @@ } }, "state": "Uncompleted" + }, + "setup_channels": { + "action": { + "create_file": { + "action": { + "path": "/root/.nix-channels", + "user": null, + "group": null, + "mode": 436, + "buf": "https://nixos.org/channels/nixpkgs-unstable nixpkgs\n", + "force": false + }, + "state": "Uncompleted" + }, + "unpacked_path": "/nix/temp-install-dir" + }, + "state": "Uncompleted" } }, "state": "Uncompleted" @@ -416,6 +433,7 @@ "ssl_cert_file": null, "extra_conf": [], "force": false, + "add_channel": true, "diagnostic_endpoint": "https://install.determinate.systems/nix/diagnostic" }, "init": { @@ -435,4 +453,4 @@ "ssl_cert_file": null, "failure_chain": null } -} \ No newline at end of file +} diff --git a/tests/fixtures/linux/steam-deck.json b/tests/fixtures/linux/steam-deck.json index 0610ff0be..a05aefb9e 100644 --- a/tests/fixtures/linux/steam-deck.json +++ b/tests/fixtures/linux/steam-deck.json @@ -354,6 +354,23 @@ } }, "state": "Uncompleted" + }, + "setup_channels": { + "action": { + "create_file": { + "action": { + "path": "/root/.nix-channels", + "user": null, + "group": null, + "mode": 436, + "buf": "https://nixos.org/channels/nixpkgs-unstable nixpkgs\n", + "force": false + }, + "state": "Uncompleted" + }, + "unpacked_path": "/nix/temp-install-dir" + }, + "state": "Uncompleted" } }, "state": "Uncompleted" @@ -400,6 +417,7 @@ "ssl_cert_file": null, "extra_conf": [], "force": false, + "add_channel": true, "diagnostic_endpoint": "https://install.determinate.systems/nix/diagnostic" } }, @@ -415,4 +433,4 @@ "ssl_cert_file": null, "failure_chain": null } -} \ No newline at end of file +} diff --git a/tests/fixtures/macos/macos.json b/tests/fixtures/macos/macos.json index 3ce5d7e05..e45889102 100644 --- a/tests/fixtures/macos/macos.json +++ b/tests/fixtures/macos/macos.json @@ -390,6 +390,23 @@ } }, "state": "Uncompleted" + }, + "setup_channels": { + "action": { + "create_file": { + "action": { + "path": "/var/root/.nix-channels", + "user": null, + "group": null, + "mode": 436, + "buf": "https://nixos.org/channels/nixpkgs-unstable nixpkgs\n", + "force": false + }, + "state": "Uncompleted" + }, + "unpacked_path": "/nix/temp-install-dir" + }, + "state": "Uncompleted" } }, "state": "Uncompleted" @@ -427,6 +444,7 @@ "ssl_cert_file": null, "extra_conf": [], "force": false, + "add_channel": true, "diagnostic_endpoint": "https://install.determinate.systems/nix/diagnostic" }, "encrypt": null, @@ -446,4 +464,4 @@ "ssl_cert_file": null, "failure_chain": null } -} \ No newline at end of file +} diff --git a/tests/plan.rs b/tests/plan.rs index a962d8c5e..e34ad0f75 100644 --- a/tests/plan.rs +++ b/tests/plan.rs @@ -10,7 +10,6 @@ const MACOS: &str = include_str!("./fixtures/macos/macos.json"); // Ensure existing plans still parse // If this breaks and you need to update the fixture, disable these tests, bump `nix_installer` to a new version, and update the plans. #[cfg(target_os = "linux")] -#[ignore] #[test] fn plan_compat_linux() -> eyre::Result<()> { let _: InstallPlan = serde_json::from_str(LINUX)?; @@ -20,7 +19,6 @@ fn plan_compat_linux() -> eyre::Result<()> { // Ensure existing plans still parse // If this breaks and you need to update the fixture, disable these tests, bump `nix_installer` to a new version, and update the plans. #[cfg(target_os = "linux")] -#[ignore] #[test] fn plan_compat_steam_deck() -> eyre::Result<()> { let _: InstallPlan = serde_json::from_str(STEAM_DECK)?; @@ -30,7 +28,6 @@ fn plan_compat_steam_deck() -> eyre::Result<()> { // Ensure existing plans still parse // If this breaks and you need to update the fixture, disable these tests, bump `nix_installer` to a new version, and update the plans. #[cfg(target_os = "macos")] -#[ignore] #[test] fn plan_compat_macos() -> eyre::Result<()> { let _: InstallPlan = serde_json::from_str(MACOS)?;