Merge branch 'tomas/expectrl-switch-from-fork' (#265)

* tomas/expectrl-switch-from-fork:
  changelog: add #1142
  switch from a fork to expectrl v0.5.2

.changelog/unreleased/testing/1142-expectrl-switch-from-fork.md

@@ -0,0 +1,2 @@
+- Switch back from a fork to a newly released version of expectrl
+  ([#1142](https://github.com/anoma/anoma/pull/1142))

tests/Cargo.toml

@@ -32,7 +32,7 @@ borsh = "0.9.1"
 color-eyre = "0.5.11"
 # NOTE: enable "print" feature to see output from builds ran by e2e tests
 escargot = {version = "0.5.7"} # , features = ["print"]}
-expectrl = {git = "https://github.com/heliaxdev/expectrl.git", branch = "tomas/expect-eager-2"}
+expectrl = {version = "=0.5.2"}
 eyre = "0.6.5"
 file-serve = "0.2.0"
 fs_extra = "1.2.0"

tests/src/e2e/setup.rs

@@ -503,7 +503,7 @@ impl AnomaCmd {
     /// Wrapper over the inner `PtySession`'s functions with custom error
     /// reporting.
     pub fn exp_string(&mut self, needle: &str) -> Result<String> {
-        let found = self.session.expect_eager(needle).map_err(|e| {
+        let found = self.session.expect(needle).map_err(|e| {
             eyre!("{}\nCommand: {}\n Needle: {}", e, self, needle)
         })?;
         if found.is_empty() {
@@ -528,7 +528,7 @@ impl AnomaCmd {
     pub fn exp_regex(&mut self, regex: &str) -> Result<(String, String)> {
         let found = self
             .session
-            .expect_eager(expectrl::Regex(regex))
+            .expect(expectrl::Regex(regex))
             .map_err(|e| eyre!("Error: {}\nCommand: {}", e, self))?;
         if found.is_empty() {
             Err(eyre!(
@@ -555,7 +555,7 @@ impl AnomaCmd {
     pub fn exp_eof(&mut self) -> Result<String> {
         let found = self
             .session
-            .expect_eager(Eof)
+            .expect(Eof)
             .map_err(|e| eyre!("Error: {}\nCommand: {}", e, self))?;
         if found.is_empty() {
             Err(eyre!("Expected EOF\nCommand: {}", self))