Fix failing tests by adjusting stderr message assertions (#915)

Fixes tests in https://github.com/software-mansion/scarb/actions/runs/6910525403
software-mansion · Nov 20, 2023 · 6e42094 · 6e42094
1 parent 50e5d94
commit 6e42094
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 46 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,19 +29,19 @@ anyhow = "1"
 assert_fs = "1"
 async-trait = "0.1"
 axum = { version = "0.6", features = ["http2"] }
-cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo.git", rev = "af32da197956f59f2700d1ad1c9b10914e757af6" }
-cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo.git", rev = "af32da197956f59f2700d1ad1c9b10914e757af6" }
-cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo.git", rev = "af32da197956f59f2700d1ad1c9b10914e757af6" }
-cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo.git", rev = "af32da197956f59f2700d1ad1c9b10914e757af6" }
-cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo.git", rev = "af32da197956f59f2700d1ad1c9b10914e757af6" }
-cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo.git", rev = "af32da197956f59f2700d1ad1c9b10914e757af6" }
-cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo.git", rev = "af32da197956f59f2700d1ad1c9b10914e757af6" }
-cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo.git", rev = "af32da197956f59f2700d1ad1c9b10914e757af6" }
-cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo.git", rev = "af32da197956f59f2700d1ad1c9b10914e757af6" }
-cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo.git", rev = "af32da197956f59f2700d1ad1c9b10914e757af6" }
-cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo.git", rev = "af32da197956f59f2700d1ad1c9b10914e757af6" }
-cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo.git", rev = "af32da197956f59f2700d1ad1c9b10914e757af6" }
-cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo.git", rev = "af32da197956f59f2700d1ad1c9b10914e757af6" , features = ["env_logger"] }
+cairo-lang-compiler = { git = "https://github.com/starkware-libs/cairo", rev = "2850a160c348b72d020d1464544323c0a772c6d4" }
+cairo-lang-defs = { git = "https://github.com/starkware-libs/cairo", rev = "2850a160c348b72d020d1464544323c0a772c6d4" }
+cairo-lang-filesystem = { git = "https://github.com/starkware-libs/cairo", rev = "2850a160c348b72d020d1464544323c0a772c6d4" }
+cairo-lang-formatter = { git = "https://github.com/starkware-libs/cairo", rev = "2850a160c348b72d020d1464544323c0a772c6d4" }
+cairo-lang-language-server = { git = "https://github.com/starkware-libs/cairo", rev = "2850a160c348b72d020d1464544323c0a772c6d4" }
+cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo", rev = "2850a160c348b72d020d1464544323c0a772c6d4" }
+cairo-lang-semantic = { git = "https://github.com/starkware-libs/cairo", rev = "2850a160c348b72d020d1464544323c0a772c6d4" }
+cairo-lang-sierra = { git = "https://github.com/starkware-libs/cairo", rev = "2850a160c348b72d020d1464544323c0a772c6d4" }
+cairo-lang-sierra-to-casm = { git = "https://github.com/starkware-libs/cairo", rev = "2850a160c348b72d020d1464544323c0a772c6d4" }
+cairo-lang-starknet = { git = "https://github.com/starkware-libs/cairo", rev = "2850a160c348b72d020d1464544323c0a772c6d4" }
+cairo-lang-test-plugin = { git = "https://github.com/starkware-libs/cairo", rev = "2850a160c348b72d020d1464544323c0a772c6d4" }
+cairo-lang-test-runner = { git = "https://github.com/starkware-libs/cairo", rev = "2850a160c348b72d020d1464544323c0a772c6d4" }
+cairo-lang-utils = { git = "https://github.com/starkware-libs/cairo", rev = "2850a160c348b72d020d1464544323c0a772c6d4", features = ["env_logger"] }
 camino = { version = "1", features = ["serde1"] }
 cargo_metadata = ">=0.18"
 clap = { version = "4", features = ["derive", "env", "string"] }

diff --git a/scarb/tests/build.rs b/scarb/tests/build.rs
@@ -684,6 +684,6 @@ fn edition_must_exist() {
                    |
                  4 | edition = "2021"
                    |           ^^^^^^
-                 unknown variant `2021`, expected `2023_01` or `2023_10`
+                 unknown variant `2021`, expected one of `2023_01`, `2023_10`, `2023_11`
         "#});
 }
diff --git a/scarb/tests/build_starknet_contract.rs b/scarb/tests/build_starknet_contract.rs
@@ -384,7 +384,7 @@ fn compile_starknet_contract_without_starknet_dep() {
             fn constructor(ref self: ContractState, value_: u128) {
                                      ^***********^
 
-        error: Method `write` not found on type "<missing>". Did you import the correct trait and impl?
+        error: Method `write` not found on type `<missing>`. Did you import the correct trait and impl?
          --> [..]/lib.cairo:20:20
                 self.value.write(value_);
                            ^***^
@@ -399,7 +399,7 @@ fn compile_starknet_contract_without_starknet_dep() {
                 fn get(self: @ContractState) -> u128 {
                               ^***********^
 
-        error: Method `read` not found on type "<missing>". Did you import the correct trait and impl?
+        error: Method `read` not found on type `<missing>`. Did you import the correct trait and impl?
          --> [..]/lib.cairo:26:24
                     self.value.read()
                                ^**^
@@ -409,7 +409,7 @@ fn compile_starknet_contract_without_starknet_dep() {
                 fn increase(ref self: ContractState, a: u128)  {
                                       ^***********^
 
-        error: Method `write` not found on type "<missing>". Did you import the correct trait and impl?
+        error: Method `write` not found on type `<missing>`. Did you import the correct trait and impl?
          --> [..]/lib.cairo:29:24
                     self.value.write( self.value.read() + a );
                                ^***^