ilyagr/pijul - Change WQ2GJPJWZJ2GKYWCYRZ5AMDKGNTTT3IR2NA7JJZEZRUQRBSOXJYAC

Make tests compile

Removes conflict markers and re-adds dev dependencies exitcode and expectrl.

expectrl is updated to the latest version, which has some breaking API changes.

Created by kim on August 2, 2023

WQ2GJPJWZJ2GKYWCYRZ5AMDKGNTTT3IR2NA7JJZEZRUQRBSOXJYAC

Dependencies

In channels

main

Change contents

Replacement in pijul/tests/common/mod.rs at line 90 [3.10839]

B:BD[3.13089] → [3.13089:13245]

        if let Some(invalid) = self.invalid_input() && !valid {
            invalid.as_string()
        } else {
            self.valid_input().as_string()

[3.13089]

[3.13245]

        if let Some(invalid) = self.invalid_input() {
            if !valid {
                return invalid.as_string();
            }

Insertion in pijul/tests/common/mod.rs at line 95 [3.10839]
[3.13255]
[3.13255]
```
        self.valid_input().as_string()
```

Replacement in pijul/tests/common/mod.rs at line 134 [3.10839]

B:BD[3.14484] → [3.14484:14556]

                    session.send_control(ControlCode::CarriageReturn)?;

[3.14484]

[3.14556]

                    session.send(ControlCode::CarriageReturn)?;

Replacement in pijul/tests/common/mod.rs at line 145 [3.10839]

B:BD[3.15010] → [3.15010:15078]

                session.send_control(ControlCode::CarriageReturn)?;

[3.15010]

[3.15078]

                session.send(ControlCode::CarriageReturn)?;

Replacement in pijul/tests/common/mod.rs at line 151 [3.10839]

B:BD[3.15338] → [3.15338:15406]

                session.send_control(ControlCode::CarriageReturn)?;

[3.15338]

[3.15406]

                session.send(ControlCode::CarriageReturn)?;

Replacement in pijul/tests/common/mod.rs at line 163 [3.10839]

B:BD[3.15957] → [3.15957:16029]

                    session.send_control(ControlCode::CarriageReturn)?;

[3.15957]

[3.16029]

                    session.send(ControlCode::CarriageReturn)?;

Replacement in pijul/tests/common/mod.rs at line 179 [3.10839]

B:BD[3.16804] → [3.16804:16880]

                        session.send_control(ControlCode::CarriageReturn)?;

[3.16804]

[3.16880]

                        session.send(ControlCode::CarriageReturn)?;

Replacement in pijul/tests/common/mod.rs at line 187 [3.10839]

B:BD[3.17166] → [3.17166:17238]

                    session.send_control(ControlCode::CarriageReturn)?;

[3.17166]

[3.17238]

                    session.send(ControlCode::CarriageReturn)?;

Replacement in pijul/tests/common/mod.rs at line 208 [3.10839]

B:BD[3.17725] → [3.17725:17780]

        session.send_control(ControlCode::Backspace)?;

[3.17725]

[3.17780]

        session.send(ControlCode::Backspace)?;

Replacement in pijul/tests/common/identity.rs at line 300 [3.17837]

B:BD[3.26933] → [3.26933:27044]

        if let Some(password) = self.password.clone() && valid {
            password.interact(&mut session)?;

[3.26933]

[3.27044]

        if valid {
            if let Some(password) = self.password.clone() {
                password.interact(&mut session)?;
            }

Replacement in pijul/tests/common/identity.rs at line 306 [3.17837]
B:BD[3.27055] → [3.27055:27083]
```
        Ok(session.wait()?)
```
[3.27055]
[3.27083]
```
        Ok(session.get_process().wait()?)
```
Replacement in pijul/tests/common/identity.rs at line 403 [3.17837]
B:BD[3.29418] → [3.29418:29446]
```
        Ok(session.wait()?)
```
[3.29418]
[3.29446]
```
        Ok(session.get_process().wait()?)
```

Replacement in pijul/tests/common/identity.rs at line 468 [3.17837]

B:BD[3.31977] → [3.31977:32023]

                let status = session.wait()?;

[3.31977]

[3.32023]

                let status = session.get_process().wait()?;

Insertion in pijul/Cargo.toml at line 119 [4.196374]
[2.361]
```
[dev-dependencies]
exitcode = "1.1.2"
expectrl = "0.7"
```