ilyagr/pijul - Change UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC

Fixing the tests

Created by pmeunier on January 4, 2022

UAFZU2RYB3K2HDVYMD7IIPBVOCSYBS7ZKUFSKBMGOC6HT6RR7PGAC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/tests/unrecord.rs at line 546 [3.248807]

B:BD[3.267896] → [3.267896:267973]

    let mut conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();

[3.267896]

[3.267973]


    let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();
    let buf_ = re.replace_all(&buf, &[][..]);
    let mut conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();

Replacement in libpijul/src/tests/unrecord.rs at line 554 [3.248807]

B:BD[3.268028] → [3.268028:268263]

        vec![
            "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
            "================================",
            ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
            "a",
            "b",
            "x",
            "y"
        ]

[3.268028]

[3.268263]

        vec!["<<<<<<< 1", "======= 1", ">>>>>>> 1", "a", "b", "x", "y"]

Insertion in libpijul/src/tests/unrecord.rs at line 822 [3.248807]

[4.27769]

[5.1794]

    let (x, _) = inodes.next().unwrap().unwrap();
    assert!(x.is_root());

Replacement in libpijul/src/tests/text.rs at line 32 [6.10]

B:BD[6.1117] → [6.1117:1206]

        vec!["+ French / Français (Windows CP 1252)", "+ €‚ƒ„…†‡, Salut"],

[6.1117]

[6.1206]

        vec![
            "+ French / Français (Windows CP 1252)",
            "+ € abcde ‚ xys ƒ uvw „ !bla …... † XA>TH ‡, Salut"
        ],

Replacement in libpijul/src/tests/performance.rs at line 53 [3.278146]
∅:D[7.6193] → [3.279923:279951]
∅:D[4.27843] → [3.279923:279951]
B:BD[3.279923] → [3.279923:279951]
```
        let m0 = n * 8 + 6;
```
[7.6193]
[3.279951]
```
        let m0 = n * 8 + 10;
```

Insertion in libpijul/src/tests/missing_context.rs at line 110 [3.291589]

[3.294404]

    let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();
    let buf_ = re.replace_all(&buf, &[][..]);

Replacement in libpijul/src/tests/missing_context.rs at line 114 [3.291589]

B:BD[3.294449] → [3.294449:294504]

B:BD[3.294504] → [2.22757:22860]

∅:D[8.4360] → [3.294603:294642]

∅:D[9.14575] → [3.294603:294642]

∅:D[2.22860] → [3.294603:294642]

B:BD[3.294603] → [3.294603:294642]

            std::str::from_utf8(&buf),
            Ok(
                &"a\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\ny\nz\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\nf\n"
                    [..]
            )

[3.294449]

[3.294642]

            std::str::from_utf8(&buf_),
            Ok(&"a\n>>>>>>> 0\nx\ny\nz\n<<<<<<< 0\nf\n"[..])

Replacement in libpijul/src/tests/missing_context.rs at line 119 [3.291589]

B:BD[3.294686] → [3.294686:294725]

B:BD[3.294725] → [2.22861:22992]

            std::str::from_utf8(&buf),
            Ok(
                &">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\ny\nz\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n"[..]
            )

[3.294686]

[3.294822]

            std::str::from_utf8(&buf_),
            Ok(&">>>>>>> 0\nx\ny\nz\n<<<<<<< 0\n"[..])

Insertion in libpijul/src/tests/missing_context.rs at line 167 [3.291589]
[3.296056]
[3.296056]
```
        let buf_ = re.replace_all(&buf, &[][..]);
```

Replacement in libpijul/src/tests/missing_context.rs at line 169 [3.291589]

B:BD[3.296076] → [3.296076:296131]

B:BD[3.296131] → [9.15220:15391]

∅:D[9.15391] → [3.296230:296269]

B:BD[3.296230] → [3.296230:296269]

            std::str::from_utf8(&buf),
            Ok(
                &"a\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\ny\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nz\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\nf\n"
                    [..]
            )

[3.296076]

[3.296269]

            std::str::from_utf8(&buf_),
            Ok(&"a\n>>>>>>> 0\nx\n<<<<<<< 0\ny\n>>>>>>> 1\nz\n<<<<<<< 1\nf\n"[..])

Replacement in libpijul/src/tests/missing_context.rs at line 174 [3.291589]

B:BD[3.296313] → [3.296313:296352]

B:BD[3.296352] → [9.15392:15561]

            std::str::from_utf8(&buf),
            Ok(&">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\ny\n>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nz\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n"[..])

[3.296313]

[3.296449]

            std::str::from_utf8(&buf_),
            Ok(&">>>>>>> 0\nx\ny\nz\n<<<<<<< 0\n"[..])

Insertion in libpijul/src/tests/file_conflicts.rs at line 385 [3.305506]

[2.33076]

[3.318182]


    {
        let txn_ = txn_charlie.write();
        let mut f = std::fs::File::create("/tmp/charlie0")?;
        crate::pristine::debug(&*txn_, &txn_.graph(&*channel_charlie.read()), &mut f)?;
    }

Insertion in libpijul/src/tests/file_conflicts.rs at line 416 [3.305506]

[2.33376]

[8.5425]


    {
        let txn_ = txn_charlie.write();
        let mut f = std::fs::File::create("/tmp/charlie1")?;
        crate::pristine::debug(&*txn_, &txn_.graph(&*channel_charlie.read()), &mut f)?;
    }

Replacement in libpijul/src/tests/data/1252.1 at line 2 [6.3289]
B:BD[6.3326] → [6.3326:3341]
[6.3326]

Replacement in libpijul/src/tests/conflict.rs at line 89 [3.357372]

B:BD[3.359846] → [3.359846:359922]

        let conflict: Vec<_> = std::str::from_utf8(buf)?.lines().collect();

[3.359846]

[3.359922]

        let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();
        let buf_ = re.replace_all(&buf, &[][..]);
        let conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();

Replacement in libpijul/src/tests/conflict.rs at line 100 [3.357372]

B:BD[3.360154] → [3.360154:360266]

                    ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
                    "================================",

[3.360154]

[3.360266]

                    ">>>>>>> 1",
                    "======= 1",

Replacement in libpijul/src/tests/conflict.rs at line 108 [3.357372]

B:BD[3.360416] → [3.360416:360472]

                    "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",

[3.360416]

[3.360472]

                    "<<<<<<< 1",

Replacement in libpijul/src/tests/conflict.rs at line 309 [3.357372]

B:BD[3.365897] → [3.365897:365973]

        let conflict: Vec<_> = std::str::from_utf8(buf)?.lines().collect();

[3.365897]

[3.365973]

        let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();
        let buf_ = re.replace_all(&buf, &[][..]);
        let conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();

Replacement in libpijul/src/tests/conflict.rs at line 321 [3.357372]

B:BD[3.366205] → [3.366205:366373]

                    ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
                    "================================",
                    "================================",

[3.366205]

[3.366373]

                    ">>>>>>> 1",
                    "======= 1",
                    "======= 1",

Replacement in libpijul/src/tests/conflict.rs at line 327 [3.357372]

B:BD[3.366448] → [3.366448:366504]

                    "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",

[3.366448]

[3.366504]

                    "<<<<<<< 1",

Replacement in libpijul/src/tests/conflict.rs at line 400 [3.357372]

B:BD[3.368066] → [3.368066:368147]

        let mut conflict: Vec<_> = std::str::from_utf8(&buf)?.lines().collect();

[3.368066]

[10.2816]

        let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();
        let buf_ = re.replace_all(&buf, &[][..]);
        let mut conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();

Replacement in libpijul/src/tests/conflict.rs at line 408 [3.357372]

B:BD[3.368266] → [3.368266:368370]

                ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
                "================================",

[3.368266]

[3.368370]

                ">>>>>>> 1",
                "======= 1",

Replacement in libpijul/src/tests/conflict.rs at line 413 [3.357372]
B:BD[3.368433] → [3.368433:368485]
```
                "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",
```
[3.368433]
[3.368485]
```
                "<<<<<<< 1",
```

Replacement in libpijul/src/tests/conflict.rs at line 704 [3.357372]

∅:D[7.17923] → [3.377504:377575]

∅:D[9.24608] → [3.377504:377575]

B:BD[3.377504] → [3.377504:377575]

    assert_eq!(std::str::from_utf8(&buf), std::str::from_utf8(&buf2));

[3.377440]

[3.377575]

    let re = regex::bytes::Regex::new(r#"\[[^\]]*\]"#).unwrap();
    let buf_ = re.replace_all(&buf, &[][..]);
    let buf2_ = re.replace_all(&buf2, &[][..]);

Insertion in libpijul/src/tests/conflict.rs at line 708 [3.357372]
[3.377576]
[3.377576]
```
    assert_eq!(std::str::from_utf8(&buf_), std::str::from_utf8(&buf2_));
```

Replacement in libpijul/src/tests/conflict.rs at line 830 [3.357372]

∅:D[7.18442] → [3.381346:381417]

∅:D[9.25064] → [3.381346:381417]

B:BD[3.381346] → [3.381346:381417]

    assert_eq!(std::str::from_utf8(&buf), std::str::from_utf8(&buf2));

[3.381282]

[3.381417]

    let re = regex::bytes::Regex::new(r#"\[[^\]]*\]"#).unwrap();
    let buf_ = re.replace_all(&buf, &[][..]);
    let buf2_ = re.replace_all(&buf2, &[][..]);
    assert_eq!(std::str::from_utf8(&buf_), std::str::from_utf8(&buf2_));

Replacement in libpijul/src/tests/conflict.rs at line 1002 [3.357372]
∅:D[11.92] → [3.386401:386432]
B:BD[3.386401] → [3.386401:386432]
```
    assert_eq!(lines, lines2);
```
[11.92]
[3.386432]
```
    assert_eq!(&lines[3..], &lines2[3..]);
```

Replacement in libpijul/src/tests/conflict.rs at line 1083 [3.357372]

B:BD[3.388991] → [10.2980:3031]

∅:D[10.3031] → [3.389033:389380]

B:BD[3.389033] → [3.389033:389380]

            (&mut conflict[2..5]).sort_unstable();
            assert_eq!(
                conflict,
                vec![
                    "a",
                    ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
                    "================================",
                    "x",
                    "y",
                    "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
                ]
            );

[3.388991]

[3.389380]

            conflict.sort_unstable();
            assert_eq!(&conflict[3..], ["a", "x", "y",]);
            assert_eq!(conflict[0], "<<<<<<< 1",);

Replacement in libpijul/src/tests/conflict.rs at line 1211 [3.357372]

B:BD[3.393273] → [3.393273:393558]

        let conflict: Vec<_> = std::str::from_utf8(buf)?.lines().collect();
        assert_eq!(
            conflict,
            vec![
                ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
                "x",
                "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
            ]
        );

[3.393273]

[3.393558]

        let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();
        let buf_ = re.replace_all(&buf, &[][..]);
        let conflict: Vec<_> = std::str::from_utf8(&buf_)?.lines().collect();
        assert_eq!(conflict, vec![">>>>>>> 0", "x", "<<<<<<< 0"]);

Replacement in libpijul/src/tests/conflict.rs at line 1287 [3.357372]

B:BD[3.395401] → [3.395401:395485]

            let buf: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();

[3.395401]

[3.395485]

            let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();
            let buf_ = re.replace_all(&buf, &[][..]);
            let buf: Vec<_> = std::str::from_utf8(&buf_).unwrap().lines().collect();

Replacement in libpijul/src/tests/conflict.rs at line 1293 [3.357372]

B:BD[3.395557] → [3.395557:395613]

                    ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",

[3.395557]

[3.395613]

                    ">>>>>>> 1",

Replacement in libpijul/src/tests/conflict.rs at line 1297 [3.357372]

B:BD[3.395688] → [3.395688:395744]

                    "================================",

[3.395688]

[3.395744]

                    "======= 1",

Replacement in libpijul/src/tests/conflict.rs at line 1301 [3.357372]

B:BD[3.395819] → [3.395819:395875]

                    "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",

[3.395819]

[3.395875]

                    "<<<<<<< 1",

Replacement in libpijul/src/tests/conflict.rs at line 1306 [3.357372]

B:BD[3.395980] → [3.395980:396040]

                        ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",

[3.395980]

[3.396040]

                        ">>>>>>> 1",

Replacement in libpijul/src/tests/conflict.rs at line 1310 [3.357372]

B:BD[3.396127] → [3.396127:396187]

                        "================================",

[3.396127]

[3.396187]

                        "======= 1",

Replacement in libpijul/src/tests/conflict.rs at line 1314 [3.357372]

B:BD[3.396274] → [3.396274:396334]

                        "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",

[3.396274]

[3.396334]

                        "<<<<<<< 1",

Replacement in libpijul/src/tests/conflict.rs at line 1337 [3.357372]

B:BD[3.396908] → [3.396908:396992]

            let buf: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();

[3.396908]

[3.396992]

            let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();
            let buf_ = re.replace_all(&buf, &[][..]);
            let buf: Vec<_> = std::str::from_utf8(&buf_).unwrap().lines().collect();

Replacement in libpijul/src/tests/conflict.rs at line 1343 [3.357372]

B:BD[3.397064] → [3.397064:397120]

                    ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",

[3.397064]

[3.397120]

                    ">>>>>>> 1",

Replacement in libpijul/src/tests/conflict.rs at line 1347 [3.357372]

B:BD[3.397195] → [3.397195:397251]

                    "================================",

[3.397195]

[3.397251]

                    "======= 1",

Replacement in libpijul/src/tests/conflict.rs at line 1351 [3.357372]

B:BD[3.397326] → [3.397326:397382]

                    "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",

[3.397326]

[3.397382]

                    "<<<<<<< 1",

Replacement in libpijul/src/tests/conflict.rs at line 1356 [3.357372]

B:BD[3.397487] → [3.397487:397547]

                        ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",

[3.397487]

[3.397547]

                        ">>>>>>> 1",

Replacement in libpijul/src/tests/conflict.rs at line 1360 [3.357372]

B:BD[3.397634] → [3.397634:397694]

                        "================================",

[3.397634]

[3.397694]

                        "======= 1",

Replacement in libpijul/src/tests/conflict.rs at line 1364 [3.357372]

B:BD[3.397781] → [3.397781:397841]

                        "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<",

[3.397781]

[3.397841]

                        "<<<<<<< 1",

Replacement in libpijul/src/tests/conflict.rs at line 1506 [3.357372]

B:BD[3.402116] → [3.402116:402198]

    let mut lines: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();

[3.402116]

[10.3136]


    let re = regex::bytes::Regex::new(r#"\[[^\]]*\]"#).unwrap();
    let buf_ = re.replace_all(&buf, &[][..]);
    let buf2_ = re.replace_all(&buf2, &[][..]);
    let mut lines: Vec<_> = std::str::from_utf8(&buf_).unwrap().lines().collect();

Replacement in libpijul/src/tests/conflict.rs at line 1513 [3.357372]

∅:D[10.3163] → [3.402216:402300]

B:BD[3.402216] → [3.402216:402300]

    let mut lines2: Vec<_> = std::str::from_utf8(&buf2).unwrap().lines().collect();

[10.3163]

[10.3164]

    let mut lines2: Vec<_> = std::str::from_utf8(&buf2_).unwrap().lines().collect();

Replacement in libpijul/src/tests/conflict.rs at line 1664 [3.357372]

B:BD[3.406827] → [3.406827:406909]

    let mut lines: Vec<_> = std::str::from_utf8(&buf).unwrap().lines().collect();

[3.406827]

[10.3193]

    let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();
    let buf_ = re.replace_all(&buf, &[][..]);
    let buf2_ = re.replace_all(&buf2, &[][..]);
    let mut lines: Vec<_> = std::str::from_utf8(&buf_).unwrap().lines().collect();

Replacement in libpijul/src/tests/conflict.rs at line 1670 [3.357372]

∅:D[10.3220] → [3.406927:407011]

B:BD[3.406927] → [3.406927:407011]

    let mut lines2: Vec<_> = std::str::from_utf8(&buf2).unwrap().lines().collect();

[10.3220]

[10.3221]

    let mut lines2: Vec<_> = std::str::from_utf8(&buf2_).unwrap().lines().collect();

Replacement in libpijul/src/tests/conflict.rs at line 1753 [3.357372]

B:BD[3.409766] → [3.409766:409910]

    assert_eq!(
        std::str::from_utf8(&buf),
        Ok(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n")
    );

[3.409766]

[3.409910]

    let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();
    let buf_ = re.replace_all(&buf, &[][..]);
    assert_eq!(std::str::from_utf8(&buf_), Ok(">>>>>>> 0\nx\n<<<<<<< 0\n"));

Replacement in libpijul/src/tests/conflict.rs at line 1794 [3.357372]

B:BD[3.410878] → [3.410878:411023]

    assert_eq!(
        std::str::from_utf8(&buf2),
        Ok(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n")
    );

[3.410878]

[2.67977]

    let buf2_ = re.replace_all(&buf2, &[][..]);
    assert_eq!(std::str::from_utf8(&buf2_), Ok(">>>>>>> 0\nx\n<<<<<<< 0\n"));

Insertion in libpijul/src/tests/conflict.rs at line 1886 [3.357372]

[3.414006]

    let re = regex::bytes::Regex::new(r#" \[[^\]]*\]"#).unwrap();
    let buf_ = re.replace_all(&buf, &[][..]);

Replacement in libpijul/src/tests/conflict.rs at line 1889 [3.357372]

B:BD[3.414022] → [3.414022:414149]

        std::str::from_utf8(&buf),
        Ok(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>\nx\ny\nz\n<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n")

[3.414022]

[3.414149]

        std::str::from_utf8(&buf_),
        Ok(">>>>>>> 0\nx\ny\nz\n<<<<<<< 0\n")