DXR is a code search and navigation tool aimed at making sense of large projects. It supports full-text and regex searches as well as structural queries.

Mercurial (9596d7f4a745)

VCS Links

Line Code
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229
from io import BytesIO

import mozunit

import metamerge

ancestor = """
global-new-deleted: A
global-new-changed: A
global-current-deleted: A
global-current-changed: A

[failing-test.html]
  [Unchanged subtest]
    expected: FAIL

  [New deleted subtest]
    expected: FAIL

  [New modified subtest]
    expected: TIMEOUT

  [Current deleted subtest]
    expected: FAIL

  [New modified current deleted]
    expected: FAIL

  [Ancestor no expected new expected]
    bug: 1234

[new-deleted-test.html]
  [Deleted subtest]
    expected: FAIL

[current-deleted-test.html]
  [Deleted subtest]
    expected: FAIL

[test-modified.html]
  expected: TIMEOUT

[new-modified-current-deleted.html]
  expected:
    if os == "linux": FAIL
    TIMEOUT

[new-add-expected-with-subtest.html]
  [subtest]
    expected: FAIL

[current-add-expected-with-subtest.html]
  [subtest]
    expected: FAIL
"""

new = """
global-new-added: A
global-new-changed: B
global-current-deleted: A
global-current-changed: A

[failing-test.html]
  [Unchanged subtest]
    expected: FAIL

  [New added subtest]
    expected: FAIL

  [New modified subtest]
    expected:
      if os == "linux": FAIL
      TIMEOUT

  [Current deleted subtest]
    expected: FAIL

  [New modified current deleted]
    expected: TIMEOUT

  [Ancestor no expected new expected]
    bug: 1234
    expected: FAIL

[new-added-test.html]
  [Added subtest]
    expected: FAIL

[current-deleted-test.html]
  [Deleted subtest]
    expected: FAIL

[test-modified.html]
  expected:
    if os == "linux": FAIL

[new-modified-current-deleted.html]
  expected:
    if os == "linux": FAIL
    if os == "mac": FAIL
    TIMEOUT

[new-add-expected-with-subtest.html]
  expected: FAIL
  [subtest]
    expected: FAIL

[current-add-expected-with-subtest.html]
  [subtest]
    expected: FAIL
"""

current = """
global-new-deleted: A
global-new-changed: A
global-current-added: A
global-current-changed: B

[failing-test.html]
  [Unchanged subtest]
    expected: FAIL

  [New deleted subtest]
    expected: FAIL

  [New modified subtest]
    expected: TIMEOUT

  [Current added subtest]
    expected: FAIL

  [Ancestor no expected new expected]
    bug: 1234

[new-deleted-test.html]
  [Deleted subtest]
    expected: FAIL

[current-added-test.html]
  [Added subtest]
    expected: FAIL

[new-add-expected-with-subtest.html]
  [subtest]
    expected: FAIL

[current-add-expected-with-subtest.html]
  expected: FAIL
  [subtest]
    expected: FAIL
"""

updated = """global-new-deleted: A
global-new-changed: A
global-current-added: A
global-current-changed: B
[failing-test.html]
  [Unchanged subtest]
    expected: FAIL

  [New modified subtest]
    expected:
      if os == "linux": FAIL
      TIMEOUT

  [Current added subtest]
    expected: FAIL

  [Ancestor no expected new expected]
    expected: FAIL
    bug: 1234

  [New added subtest]
    expected: FAIL

  [New modified current deleted]
    expected: TIMEOUT


[current-added-test.html]
  [Added subtest]
    expected: FAIL


[new-add-expected-with-subtest.html]
  expected: FAIL
  [subtest]
    expected: FAIL


[current-add-expected-with-subtest.html]
  expected: FAIL
  [subtest]
    expected: FAIL


[new-added-test.html]
  [Added subtest]
    expected: FAIL


[test-modified.html]
  expected:
    if os == "linux": FAIL

[new-modified-current-deleted.html]
  expected:
    if os == "linux": FAIL
    if os == "mac": FAIL
    TIMEOUT
"""


def test_merge():
    def get_manifest(str_data):
        bytes_io = BytesIO(str_data)
        return metamerge.compile(bytes_io,
                                 metamerge.data_cls_getter)
    ancestor_manifest = get_manifest(ancestor)
    current_manifest = get_manifest(current)
    new_manifest = get_manifest(new)

    result = metamerge.make_changes(ancestor_manifest,
                                    current_manifest,
                                    new_manifest)
    assert result == updated

if __name__ == '__main__':
    mozunit.main()