diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-04-18 21:31:53 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-04-18 21:31:53 -0400 |
| commit | eeb266c1395e582f1480f49316a5014ac77e8f50 (patch) | |
| tree | 6117e4a2cdf77a81f81032816f1c57986da4c1b5 /src | |
| parent | 459643502b8958b44852d304cd1846d027628fc6 (diff) | |
| parent | 5a7e39c0cbca3f2b94834167154472a61fc34a03 (diff) | |
| download | tor-eeb266c1395e582f1480f49316a5014ac77e8f50.tar.gz tor-eeb266c1395e582f1480f49316a5014ac77e8f50.zip | |
Merge remote-tracking branches 'sebastian/consdiff_add' and 'sebastian/consdiff_newline'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/consdiff.c | 2 | ||||
| -rw-r--r-- | src/test/test_consdiff.c | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/src/or/consdiff.c b/src/or/consdiff.c index 3481c8f9f1..15a614e0fe 100644 --- a/src/or/consdiff.c +++ b/src/or/consdiff.c @@ -671,7 +671,7 @@ gen_ed_diff(const smartlist_t *cons1, const smartlist_t *cons2, */ i1=len1-1, i2=len2-1; char buf[128]; - while (i1 > 0 || i2 > 0) { + while (i1 >= 0 || i2 >= 0) { int start1x, start2x, end1, end2, added, deleted; diff --git a/src/test/test_consdiff.c b/src/test/test_consdiff.c index 6c3a8e092c..91986161c9 100644 --- a/src/test/test_consdiff.c +++ b/src/test/test_consdiff.c @@ -622,6 +622,17 @@ test_consdiff_gen_ed_diff(void *arg) tt_str_eq_line(".", smartlist_get(diff, 5)); tt_str_eq_line("2d", smartlist_get(diff, 6)); + smartlist_clear(cons1); + smartlist_clear(cons2); + consensus_split_lines(cons1, "B\n", area); + consensus_split_lines(cons2, "A\nB\n", area); + diff = gen_ed_diff(cons1, cons2, area); + tt_ptr_op(NULL, OP_NE, diff); + tt_int_op(3, OP_EQ, smartlist_len(diff)); + tt_str_eq_line("0a", smartlist_get(diff, 0)); + tt_str_eq_line("A", smartlist_get(diff, 1)); + tt_str_eq_line(".", smartlist_get(diff, 2)); + /* TODO: small real use-cases, i.e. consensuses. */ done: |