Merge pull request #145 from DeterminateSystems/fix-broken-test

Fix broken test
DeterminateSystems · Dec 4, 2024 · 9fb0807 · 9fb0807
2 parents 9c9224a + bc88126
commit 9fb0807
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "flake-checker"
-version = "0.2.0"
+version = "0.2.1"
 edition = "2021"
 
 [workspace]

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -2,13 +2,10 @@
   inputs = {
     nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/0.2405.*";
     rust-overlay = {
-      url = "github:oxalica/rust-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    crane = {
-      url = "https://flakehub.com/f/ipetkov/crane/0.17.*";
+      url = "https://flakehub.com/f/oxalica/rust-overlay/*";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    crane.url = "https://flakehub.com/f/ipetkov/crane/0.19.*";
   };
 
   outputs = { self, ... }@inputs:

diff --git a/src/flake.rs b/src/flake.rs
@@ -157,7 +157,7 @@ mod test {
     fn cel_conditions() {
         // (condition, expected)
         let cases: Vec<(&str, bool)> = vec![
-            (include_str!("../tests/cel-condition.txt"), true),
+            (include_str!("../tests/cel-condition.cel"), true),
             (
 
                 "has(gitRef) && has(numDaysOld) && has(owner) && has(supportedRefs) && supportedRefs.contains(gitRef) && owner != 'NixOS'",
@@ -189,6 +189,8 @@ mod test {
             );
 
             if expected {
+                println!("{result:?}");
+
                 assert!(result.is_ok());
                 assert!(result.unwrap().is_empty());
             } else {

diff --git a/tests/cel-condition.txt → tests/cel-condition.cel b/tests/cel-condition.txt → tests/cel-condition.cel
@@ -1,4 +1,4 @@
-supportedRefs == ['nixos-24.05', 'nixos-24.05-small', 'nixos-unstable', 'nixos-unstable-small', 'nixpkgs-24.05-darwin', 'nixpkgs-unstable']
+['nixos-unstable', 'nixos-unstable-small', 'nixpkgs-unstable'].map(rev, supportedRefs.contains(rev))
     && owner == 'NixOS'
     && gitRef == 'nixos-unstable'
     && supportedRefs.contains(gitRef)