Rework alternate result system
If a different result is expected for a specific version,
tag the result with the version name.
This is then used instead of the default expected value.
It also allows for different overrides for different versions
diff --git a/README.md b/README.md
index a833032..b9b1d79 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@
Version 0.10 of Ponymail never detects format=flowed mails.
This is because the content-type entry was not set up in msg_metadata
As a consequence, some mails will be parsed differently.
-The test scripts allow for an alternate value for some tests.
+The test scripts allow for an alternate value for some tests, shown as v0.10.
PLEASE NOTE
===========
diff --git a/tests/interfacer.py b/tests/interfacer.py
index ef7bbd2..1c065bc 100644
--- a/tests/interfacer.py
+++ b/tests/interfacer.py
@@ -39,9 +39,9 @@
self.archie = archiver_.Archiver(parseHTML=args.parse_html)
params = inspect.signature(archiver_.Archiver.list_url).parameters
if '_mlist' in params:
- self.version = '11'
+ self.version = 'v0.11'
elif 'mlist' in params:
- self.version = '10'
+ self.version = 'v0.10'
else:
self.version = '?'
# Ponymail 12+
@@ -50,7 +50,7 @@
parse_html=args.parse_html,
ignore_body=None, # To be provided later
skipff=True)
- self.version = '12'
+ self.version = 'v0.12'
else: # Foal
self.archie = archiver_.Archiver(generator=getattr(args, 'generator', None),
parse_html=args.parse_html,
diff --git a/tests/test-generators.py b/tests/test-generators.py
index 52b03d1..c828e5e 100755
--- a/tests/test-generators.py
+++ b/tests/test-generators.py
@@ -146,12 +146,10 @@
lid = args.lid or archiver.normalize_lid(message.get('list-id', '??'))
json = archie.compute_updates(fake_args, lid, False, message, message_raw)
- expected = test['generated']
- alternate = expected
- if archie.version == '10' or archie.version == _env.get('ALT_VERSION'):
- alternate = test.get('alternate') # alternate value for v0.10
+ # get override for version (if any)
+ expected = test.get(archie.version, test['generated'])
actual = json['mid']
- if actual != expected and actual != alternate:
+ if actual != expected:
errors += 1
sys.stderr.write("""[FAIL] %s, index %2u: Expected '%s', got '%s'!\n""" %
(gen_type, key, expected, actual))
diff --git a/tests/test-parsing.py b/tests/test-parsing.py
index f0ede42..5e95a99 100755
--- a/tests/test-parsing.py
+++ b/tests/test-parsing.py
@@ -115,11 +115,9 @@
if json and json.get('body') is not None:
if not json.get('html_source_only'):
body_sha3_256 = hashlib.sha3_256(json['body'].encode('utf-8')).hexdigest()
- expected = test['body_sha3_256']
- alternate = expected
- if archie.version == '10' or archie.version == _env.get('ALT_VERSION'):
- alternate = test.get('alternate') # alternate value for v0.10
- if body_sha3_256 != expected and body_sha3_256 != alternate:
+ # get override for version (if any)
+ expected = test.get(archie.version, test['body_sha3_256'])
+ if body_sha3_256 != expected:
errors += 1
sys.stderr.write("""[FAIL] parsing index %2u: Expected: %s Got: %s\n""" %
(key, expected, body_sha3_256))
diff --git a/yaml/generate-httpd-users-200606-part.yaml b/yaml/generate-httpd-users-200606-part.yaml
index 3b7055a..c03c393 100644
--- a/yaml/generate-httpd-users-200606-part.yaml
+++ b/yaml/generate-httpd-users-200606-part.yaml
@@ -1,61 +1,59 @@
-# The "alternate" values in here are where pony mail and foal differ due to different
+# The "v0.10" values in here are where pony mail and foal differ due to different
# handling of format=flowed.
args:
cmd: tests/test-generators.py --generate generate-httpd-users-200606-part.yaml --mbox corpus/httpd-users-200606-part.mbox
--rootdir ../ponymail/
- env:
- ALT_VERSION: foal
generators:
corpus/httpd-users-200606-part.mbox:
cluster:
- index: 0
message-id: <BAY103-F28070ECF509B48E8F10ECEC2910@phx.gbl>
generated: re2dac36fb1b6c6a1a4ace8a29e33e992918b94d46c577eece7915339@<users.httpd.apache.org>
- alternate: rf5679a9dd6d693a51743647d6067446ffe36465e4a1f3a8bb618659c@<users.httpd.apache.org>
+ v0.10: rf5679a9dd6d693a51743647d6067446ffe36465e4a1f3a8bb618659c@<users.httpd.apache.org>
- index: 1
message-id: <BAY117-F8A51AB1A746DB7C5C868BB4910@phx.gbl>
generated: r45843706ca2f9e411a5ca05c13c570877d28b71d519d6272bda55c56@<users.httpd.apache.org>
- alternate: re5974b81d8e9c97c07bfe66f95e3e3c050e512c7fe3d52cf4242e908@<users.httpd.apache.org>
+ v0.10: re5974b81d8e9c97c07bfe66f95e3e3c050e512c7fe3d52cf4242e908@<users.httpd.apache.org>
- index: 2
message-id: <BAY103-F36A0C2427095C72D377474C2940@phx.gbl>
generated: rf6c2abe5470256cbdc0d1f5e02ed5a4a11b48d956da4a3f6779287a4@<users.httpd.apache.org>
- alternate: radee22ee82b366171790f614775e8410132c992a28826f604437b5b9@<users.httpd.apache.org>
+ v0.10: radee22ee82b366171790f614775e8410132c992a28826f604437b5b9@<users.httpd.apache.org>
- index: 3
message-id: <BAY103-F115CA57A21C2C56030731CE2950@phx.gbl>
generated: r5eac8b0c8a54de1824ddbde66551f26c95bdeb81b5a77943ee1741d5@<users.httpd.apache.org>
- alternate: re146eb3affc962622333bc69f3ca730429708f90eec24db87d0587a9@<users.httpd.apache.org>
+ v0.10: re146eb3affc962622333bc69f3ca730429708f90eec24db87d0587a9@<users.httpd.apache.org>
- index: 4
message-id: <BAY103-F11410841CDE610A1EFC53E2950@phx.gbl>
generated: r3d7edfc385133def2a060b11138812feeac594992e1a48d97a65201a@<users.httpd.apache.org>
- alternate: r3a605d8614bc73d007e153880a562c2805ee0add67848d4fa1575e06@<users.httpd.apache.org>
+ v0.10: r3a605d8614bc73d007e153880a562c2805ee0add67848d4fa1575e06@<users.httpd.apache.org>
- index: 5
message-id: <BAY103-F381B373856C3F8BAEF7649E2950@phx.gbl>
generated: r048d25dc4399fabcbbd45d8131ee0fe42e65eeb792ff741609572862@<users.httpd.apache.org>
- alternate: rd373c738b0fd9f7e1ba40afc9eb83d9236eacd30d9fae232571cacfb@<users.httpd.apache.org>
+ v0.10: rd373c738b0fd9f7e1ba40afc9eb83d9236eacd30d9fae232571cacfb@<users.httpd.apache.org>
- index: 6
message-id: <BAY103-F9B586FFD1CFE6D9112763E2950@phx.gbl>
generated: rf8abedc89af20b537262d4979521be5528cb36cfcca735a4d2421b20@<users.httpd.apache.org>
- alternate: re308560032d36d8f4f99e655ed770538c25792d4786a3b007722ee0a@<users.httpd.apache.org>
+ v0.10: re308560032d36d8f4f99e655ed770538c25792d4786a3b007722ee0a@<users.httpd.apache.org>
- index: 7
message-id: <BAY103-F802BFA93952CB192373C4E2950@phx.gbl>
generated: r0e7d05d267fe52a56c1b32d4f2376591113e663dd5da312f4b6fd9d6@<users.httpd.apache.org>
- alternate: rfb0b8285894b14306b1d03373895e5b6a7657ddce3608ec2d078d7f5@<users.httpd.apache.org>
+ v0.10: rfb0b8285894b14306b1d03373895e5b6a7657ddce3608ec2d078d7f5@<users.httpd.apache.org>
- index: 8
message-id: <BAY103-F40D7A4EF5AC184C9769209E2950@phx.gbl>
generated: r898bf7396a152718bd24f4d0ef814c0845a3237ec242c19f84bb4795@<users.httpd.apache.org>
- alternate: rd5783897ef3b552a4c6cca7e2f8212cd5e5233cec26ae1948c7ffe52@<users.httpd.apache.org>
+ v0.10: rd5783897ef3b552a4c6cca7e2f8212cd5e5233cec26ae1948c7ffe52@<users.httpd.apache.org>
- index: 9
message-id: <BAY103-F1C665A56AE3A65074D38DE2950@phx.gbl>
generated: r2ec8ede8a999d4745065d8239ffd7bffea28e5c98c1ff29522c98087@<users.httpd.apache.org>
- alternate: r7a8f9cc529dd7e2b7dd4af949ee284fa656d58b2f6a703b72eb8f26e@<users.httpd.apache.org>
+ v0.10: r7a8f9cc529dd7e2b7dd4af949ee284fa656d58b2f6a703b72eb8f26e@<users.httpd.apache.org>
- index: 10
message-id: <BAY103-F192188E821DBDA96D8C790C27E0@phx.gbl>
generated: rd59592d38837af0c5e0cd2a9366a7c59be77be79f521ea97dc1a550d@<users.httpd.apache.org>
- alternate: r6bd7aa7c787130188f3a6a76a19ba4e8e132ae15923e663a5e1b7614@<users.httpd.apache.org>
+ v0.10: r6bd7aa7c787130188f3a6a76a19ba4e8e132ae15923e663a5e1b7614@<users.httpd.apache.org>
- index: 11
message-id: <BAY103-F40786C94EB9152F563E277ED720@phx.gbl>
generated: r5e24e66647412055bd06e28e80e2eb40feaa40374c44d6b9cb8b9e91@<users.httpd.apache.org>
- alternate: r41283b1d1ffe65918778052d3c724608c724abf93b0746b654652bda@<users.httpd.apache.org>
+ v0.10: r41283b1d1ffe65918778052d3c724608c724abf93b0746b654652bda@<users.httpd.apache.org>
full:
- index: 0
message-id: <BAY103-F28070ECF509B48E8F10ECEC2910@phx.gbl>
@@ -97,98 +95,98 @@
- index: 0
message-id: <BAY103-F28070ECF509B48E8F10ECEC2910@phx.gbl>
generated: afa65bf43cdc37611f256805e4a95348cdc2c1c6bccfb4f82cd01fc3@1149279927@<users.httpd.apache.org>
- alternate: 8c85580c8cb79e9f55dd6c209c1076b4d2c6388c1c2929816b3ccf64@1149279927@<users.httpd.apache.org>
+ v0.10: 8c85580c8cb79e9f55dd6c209c1076b4d2c6388c1c2929816b3ccf64@1149279927@<users.httpd.apache.org>
- index: 1
message-id: <BAY117-F8A51AB1A746DB7C5C868BB4910@phx.gbl>
generated: 6cfd52153b01d182733da82ef9905f465aa3ea09bf42a3e579510afd@1149280616@<users.httpd.apache.org>
- alternate: b4614429ce0ee2934bcd730060b85eae7d1087a84330b16d5891ecc4@1149280616@<users.httpd.apache.org>
+ v0.10: b4614429ce0ee2934bcd730060b85eae7d1087a84330b16d5891ecc4@1149280616@<users.httpd.apache.org>
- index: 2
message-id: <BAY103-F36A0C2427095C72D377474C2940@phx.gbl>
generated: 01a05b64545432e6dea648639e26515a0ad0b365276c08ca1d1dd3d9@1149518530@<users.httpd.apache.org>
- alternate: 03f820ff8720bea3270c5d726f47acfa823b97b80414ee6edc45bff5@1149518530@<users.httpd.apache.org>
+ v0.10: 03f820ff8720bea3270c5d726f47acfa823b97b80414ee6edc45bff5@1149518530@<users.httpd.apache.org>
- index: 3
message-id: <BAY103-F115CA57A21C2C56030731CE2950@phx.gbl>
generated: e4a7dd49cc97768415960a077839164b49d68423ac52064713500f3d@1149556790@<users.httpd.apache.org>
- alternate: 1208fe80b452f5f3b8d660a4d7acacda8c286db3d9ace550cbd14e40@1149556790@<users.httpd.apache.org>
+ v0.10: 1208fe80b452f5f3b8d660a4d7acacda8c286db3d9ace550cbd14e40@1149556790@<users.httpd.apache.org>
- index: 4
message-id: <BAY103-F11410841CDE610A1EFC53E2950@phx.gbl>
generated: cbda2bd3506b8a39575cbd1d1dc1e43674d49a78cb7bcae9509d448a@1149556828@<users.httpd.apache.org>
- alternate: 4ff7f6fe01bb8777ce0f47084429044d3a6e5da6fd397cc99c0cde36@1149556828@<users.httpd.apache.org>
+ v0.10: 4ff7f6fe01bb8777ce0f47084429044d3a6e5da6fd397cc99c0cde36@1149556828@<users.httpd.apache.org>
- index: 5
message-id: <BAY103-F381B373856C3F8BAEF7649E2950@phx.gbl>
generated: 8f0cb30858cbe596264d09a8bad7c44635a6371e3e0af027fedbfeb8@1149556889@<users.httpd.apache.org>
- alternate: df5241d8d7e292fef2fc758a112db6eff704125fed86d4cda7e61dae@1149556889@<users.httpd.apache.org>
+ v0.10: df5241d8d7e292fef2fc758a112db6eff704125fed86d4cda7e61dae@1149556889@<users.httpd.apache.org>
- index: 6
message-id: <BAY103-F9B586FFD1CFE6D9112763E2950@phx.gbl>
generated: 31c2ae52820e35eecc06111a6e443ff0ff6e03d3374e9f2a494bb338@1149556917@<users.httpd.apache.org>
- alternate: 9477d206dada242e3291d2884136e6285f4b21c3a121c8cb67de2567@1149556917@<users.httpd.apache.org>
+ v0.10: 9477d206dada242e3291d2884136e6285f4b21c3a121c8cb67de2567@1149556917@<users.httpd.apache.org>
- index: 7
message-id: <BAY103-F802BFA93952CB192373C4E2950@phx.gbl>
generated: 986e3cbcdc69577dcba4319367f41818da2c9b8f5e0e98548edeca72@1149556939@<users.httpd.apache.org>
- alternate: 66cac5989266dc04d975e382521f3b714ae033363e963c7bd529b3c2@1149556939@<users.httpd.apache.org>
+ v0.10: 66cac5989266dc04d975e382521f3b714ae033363e963c7bd529b3c2@1149556939@<users.httpd.apache.org>
- index: 8
message-id: <BAY103-F40D7A4EF5AC184C9769209E2950@phx.gbl>
generated: 02d013d37c122c8e4356a2380983592ab6fbd22bb83ee397f68e1d67@1149556965@<users.httpd.apache.org>
- alternate: 79c8bfe5c762cc29ce827b2f4508d0e5154f3eac6a7d5096a6948a02@1149556965@<users.httpd.apache.org>
+ v0.10: 79c8bfe5c762cc29ce827b2f4508d0e5154f3eac6a7d5096a6948a02@1149556965@<users.httpd.apache.org>
- index: 9
message-id: <BAY103-F1C665A56AE3A65074D38DE2950@phx.gbl>
generated: 46a99d67aa26190fe37bda5f89c4690379d752e304fc9e5784d05a7f@1149557015@<users.httpd.apache.org>
- alternate: 0b787af017aa497ba1ad7360e41813bbe897ce916d3fb4d11db0b48e@1149557015@<users.httpd.apache.org>
+ v0.10: 0b787af017aa497ba1ad7360e41813bbe897ce916d3fb4d11db0b48e@1149557015@<users.httpd.apache.org>
- index: 10
message-id: <BAY103-F192188E821DBDA96D8C790C27E0@phx.gbl>
generated: a290cd0ad6ece5c770b80a4afed408e321cd3825568cee0181bc9298@1151433304@<users.httpd.apache.org>
- alternate: a833f80b69daffd9035974687b3a528124c0dbb9f8f7a746f2697191@1151433304@<users.httpd.apache.org>
+ v0.10: a833f80b69daffd9035974687b3a528124c0dbb9f8f7a746f2697191@1151433304@<users.httpd.apache.org>
- index: 11
message-id: <BAY103-F40786C94EB9152F563E277ED720@phx.gbl>
generated: 616106d74910f509706295764c326576f5cfa13fdb50164db05f1e92@1151716372@<users.httpd.apache.org>
- alternate: d5ef26b5d501c31413596b8485b9d466d280d7ac5e3579ab88fb5d30@1151716372@<users.httpd.apache.org>
+ v0.10: d5ef26b5d501c31413596b8485b9d466d280d7ac5e3579ab88fb5d30@1151716372@<users.httpd.apache.org>
medium:
- index: 0
message-id: <BAY103-F28070ECF509B48E8F10ECEC2910@phx.gbl>
generated: a328785f7c1db7d42fb0be8687ae5d46c2c2044f0082f02b26e75009@<users.httpd.apache.org>
- alternate: fe602675a3a0750490d5b458d98148a13035787c445af8aa89a2a5d2@<users.httpd.apache.org>
+ v0.10: fe602675a3a0750490d5b458d98148a13035787c445af8aa89a2a5d2@<users.httpd.apache.org>
- index: 1
message-id: <BAY117-F8A51AB1A746DB7C5C868BB4910@phx.gbl>
generated: aed625444b2c9c0ea3548f57309005a8c1f672b325f7456a96186cef@<users.httpd.apache.org>
- alternate: 0982ba512517dd9eeab49b5e1633659870e481dccb3ed6bd9399a3f8@<users.httpd.apache.org>
+ v0.10: 0982ba512517dd9eeab49b5e1633659870e481dccb3ed6bd9399a3f8@<users.httpd.apache.org>
- index: 2
message-id: <BAY103-F36A0C2427095C72D377474C2940@phx.gbl>
generated: 0101c4ca7205a57be22f07e68172c10d50b928644b1232089a84b5b1@<users.httpd.apache.org>
- alternate: 87c1d92c06a228f85bb1f93f8ceb2eb3c5e450fdd41a7be8e712db07@<users.httpd.apache.org>
+ v0.10: 87c1d92c06a228f85bb1f93f8ceb2eb3c5e450fdd41a7be8e712db07@<users.httpd.apache.org>
- index: 3
message-id: <BAY103-F115CA57A21C2C56030731CE2950@phx.gbl>
generated: 2b6f3c8ce69214e22d2e9e71910b4821a6ed7ad97d5625bdcdaa55f5@<users.httpd.apache.org>
- alternate: 5de8110ee04365a7c805c65cb6b7166a63478c6d1f93ccc525836be1@<users.httpd.apache.org>
+ v0.10: 5de8110ee04365a7c805c65cb6b7166a63478c6d1f93ccc525836be1@<users.httpd.apache.org>
- index: 4
message-id: <BAY103-F11410841CDE610A1EFC53E2950@phx.gbl>
generated: 65288e86a00577603e4bf30d9fc37edf15b158e4cf49c1ffb58fb61d@<users.httpd.apache.org>
- alternate: e21e3245c8646e7bb3538df34ed4c3b5057bc7c21b4b70477f34fe90@<users.httpd.apache.org>
+ v0.10: e21e3245c8646e7bb3538df34ed4c3b5057bc7c21b4b70477f34fe90@<users.httpd.apache.org>
- index: 5
message-id: <BAY103-F381B373856C3F8BAEF7649E2950@phx.gbl>
generated: a8fbb15017f96071890e0cd838df44e22bec006519c1dd257750bb16@<users.httpd.apache.org>
- alternate: 15c0b7150d9e5abcb5129ede1cb16d60b28876927cf062ee70954754@<users.httpd.apache.org>
+ v0.10: 15c0b7150d9e5abcb5129ede1cb16d60b28876927cf062ee70954754@<users.httpd.apache.org>
- index: 6
message-id: <BAY103-F9B586FFD1CFE6D9112763E2950@phx.gbl>
generated: eae0cd27fa6d04b1f5051a6b8f4cb34ffc52062755ed3eb5c1d3bc19@<users.httpd.apache.org>
- alternate: 6e14c528eb841fa388bf23d7d075f954ab67a1af6fdf6c03df98d18f@<users.httpd.apache.org>
+ v0.10: 6e14c528eb841fa388bf23d7d075f954ab67a1af6fdf6c03df98d18f@<users.httpd.apache.org>
- index: 7
message-id: <BAY103-F802BFA93952CB192373C4E2950@phx.gbl>
generated: 908db74e8ad18a05f79fe0ef15d212cbf952d33178aded7390626e66@<users.httpd.apache.org>
- alternate: 1c219ec3788f5786be915a76a5f213c27b631719e1e019bf92291bb4@<users.httpd.apache.org>
+ v0.10: 1c219ec3788f5786be915a76a5f213c27b631719e1e019bf92291bb4@<users.httpd.apache.org>
- index: 8
message-id: <BAY103-F40D7A4EF5AC184C9769209E2950@phx.gbl>
generated: f781b77a8487df9c67f7d30b2db69de95fbc414c5eac9fdb54396e82@<users.httpd.apache.org>
- alternate: 4fd9d6e2f9ae62cfe80210b86de3fd81156949e622c9080149d7a9a3@<users.httpd.apache.org>
+ v0.10: 4fd9d6e2f9ae62cfe80210b86de3fd81156949e622c9080149d7a9a3@<users.httpd.apache.org>
- index: 9
message-id: <BAY103-F1C665A56AE3A65074D38DE2950@phx.gbl>
generated: d20e0b947d0c6c686f39f621000cfbe3f86c641136d512e653acaa58@<users.httpd.apache.org>
- alternate: 19a566d9850655785be897c6b5c01380c489542e5f63e7a8e189eea8@<users.httpd.apache.org>
+ v0.10: 19a566d9850655785be897c6b5c01380c489542e5f63e7a8e189eea8@<users.httpd.apache.org>
- index: 10
message-id: <BAY103-F192188E821DBDA96D8C790C27E0@phx.gbl>
generated: 36d7b151f9dfa0e68f9919974af28c10b45ca672d990df6a20ec75d8@<users.httpd.apache.org>
- alternate: 34a899b370d724f846533be398b4b69f4e50f5e7b7a339762fa3bac7@<users.httpd.apache.org>
+ v0.10: 34a899b370d724f846533be398b4b69f4e50f5e7b7a339762fa3bac7@<users.httpd.apache.org>
- index: 11
message-id: <BAY103-F40786C94EB9152F563E277ED720@phx.gbl>
generated: 65f52f3f886ccc7d2677ca84dc53923e1bd2ac4eb32bba0268130ccc@<users.httpd.apache.org>
- alternate: 4010aa500281d93b27e40ef4c4862df6cf78612c7da136eab63c789c@<users.httpd.apache.org>
+ v0.10: 4010aa500281d93b27e40ef4c4862df6cf78612c7da136eab63c789c@<users.httpd.apache.org>
diff --git a/yaml/gens-asterix-dev-201709-mailarchivesao.yaml b/yaml/gens-asterix-dev-201709-mailarchivesao.yaml
index 67fe530..48dd710 100644
--- a/yaml/gens-asterix-dev-201709-mailarchivesao.yaml
+++ b/yaml/gens-asterix-dev-201709-mailarchivesao.yaml
@@ -1,10 +1,8 @@
-# Alternates in index 34+35 indicate a change in format=flowed parsing
args:
cmd: tests/test-generators.py --mbox corpus/asterix-dev-201709-mailarchivesao.mbox
--generate yaml/gens-asterix-dev-201709-mailarchivesao.yaml --root ../ponymail
env:
MOCK_GMTIME: "0"
- ALT_VERSION: foal
generators:
corpus/asterix-dev-201709-mailarchivesao.mbox:
cluster:
@@ -113,11 +111,11 @@
- index: 34
message-id: <710018FB-CE02-4B9A-BC36-A6B3A9A23CAD@apache.org>
generated: rdba94f692164515244cc9b51a32f74c093562af2f2957543343899c2@<dev.asterixdb.apache.org>
- alternate: rab099560bf75d6bddf4c7c5b15a0b967408272da8196bf5353ea3ea0@<dev.asterixdb.apache.org>
+ v0.10: rab099560bf75d6bddf4c7c5b15a0b967408272da8196bf5353ea3ea0@<dev.asterixdb.apache.org>
- index: 35
message-id: <6D84F738-EF80-4BA9-AEFF-47C21CA11467@apache.org>
generated: r18241c1a55fab900cb655e75706e0a83acc39e45f224bbaa7084b893@<dev.asterixdb.apache.org>
- alternate: rd7c8f5999cd6e51c19e40693634844909473c0fe8dab7622e9103d68@<dev.asterixdb.apache.org>
+ v0.10: rd7c8f5999cd6e51c19e40693634844909473c0fe8dab7622e9103d68@<dev.asterixdb.apache.org>
- index: 36
message-id: <E8CF05A0-0B7B-4A35-80C8-AC5C2D9F52D2@gmail.com>
generated: r96d23e909f626f4c4c128e3d1bd974f528e529602e7c1c0b65a5a576@<dev.asterixdb.apache.org>
@@ -435,11 +433,11 @@
- index: 34
message-id: <710018FB-CE02-4B9A-BC36-A6B3A9A23CAD@apache.org>
generated: d769bef0abdf69dd32325fa997561ee0a8b02b3eb4bd09074e15d639@1506129119@<dev.asterixdb.apache.org>
- alternate: b6cc35372810a838aa38b2298d599db6cb4c9139e837ec5d9e66098b@1506129119@<dev.asterixdb.apache.org>
+ v0.10: b6cc35372810a838aa38b2298d599db6cb4c9139e837ec5d9e66098b@1506129119@<dev.asterixdb.apache.org>
- index: 35
message-id: <6D84F738-EF80-4BA9-AEFF-47C21CA11467@apache.org>
generated: efcc2cd48e8b43c772438754af7beda3a12fbde19a683339dcfac8cb@1506216316@<dev.asterixdb.apache.org>
- alternate: d9a69ff7b9399b19a2984492945c550f64796ce8933c882ff2a2cc50@1506216316@<dev.asterixdb.apache.org>
+ v0.10: d9a69ff7b9399b19a2984492945c550f64796ce8933c882ff2a2cc50@1506216316@<dev.asterixdb.apache.org>
- index: 36
message-id: <E8CF05A0-0B7B-4A35-80C8-AC5C2D9F52D2@gmail.com>
generated: 7202d52652c68a0ab44c6478d427ffc10ec7097dc5a31c90cd54222d@1506216487@<dev.asterixdb.apache.org>
@@ -597,11 +595,11 @@
- index: 34
message-id: <710018FB-CE02-4B9A-BC36-A6B3A9A23CAD@apache.org>
generated: 824bbd05c7ca1d2fa6acfc6212d225d70cb32cc54d4cf187f29675c0@<dev.asterixdb.apache.org>
- alternate: 39d9ced47a8e82e7b40b088f4803e437a9889531d6eccaeb7e625a98@<dev.asterixdb.apache.org>
+ v0.10: 39d9ced47a8e82e7b40b088f4803e437a9889531d6eccaeb7e625a98@<dev.asterixdb.apache.org>
- index: 35
message-id: <6D84F738-EF80-4BA9-AEFF-47C21CA11467@apache.org>
generated: 0b2ea9714eebf98f96251930161f76d5eadc47d47b57a16b8dd4e603@<dev.asterixdb.apache.org>
- alternate: 97ac55a1002d6ade37525c558af2b882007c67755d923b3114d47ad0@<dev.asterixdb.apache.org>
+ v0.10: 97ac55a1002d6ade37525c558af2b882007c67755d923b3114d47ad0@<dev.asterixdb.apache.org>
- index: 36
message-id: <E8CF05A0-0B7B-4A35-80C8-AC5C2D9F52D2@gmail.com>
generated: 6c647759d2fb65c63da73b8f0065adc0ea95a8add8493395d999cf2a@<dev.asterixdb.apache.org>
diff --git a/yaml/pars-asterix-dev-201709-mailarchivesao.yaml b/yaml/pars-asterix-dev-201709-mailarchivesao.yaml
index c77241f..7ad5503 100644
--- a/yaml/pars-asterix-dev-201709-mailarchivesao.yaml
+++ b/yaml/pars-asterix-dev-201709-mailarchivesao.yaml
@@ -3,8 +3,6 @@
cmd: tests/test-parsing.py --mbox corpus/asterix-dev-201709-mailarchivesao.mbox
--generate yaml/pars-asterix-dev-201709-mailarchivesao.yaml --root ../ponymail
parse_html: false
- env:
- ALT_VERSION: foal
parsing:
corpus/asterix-dev-201709-mailarchivesao.mbox:
- index: 0
@@ -146,12 +144,14 @@
- index: 34
message-id: <710018FB-CE02-4B9A-BC36-A6B3A9A23CAD@apache.org>
body_sha3_256: a211db5af73a98c270965aab423e1c12b92efd811e72326250da5779225cae34
- alternate: c75e7fc37c217084a30a6f42b08c3454b8beb9fd6c43f68a46ea941ff9f41b8a
+ v0.10: c75e7fc37c217084a30a6f42b08c3454b8beb9fd6c43f68a46ea941ff9f41b8a
+ foal: c75e7fc37c217084a30a6f42b08c3454b8beb9fd6c43f68a46ea941ff9f41b8a
attachments: []
- index: 35
message-id: <6D84F738-EF80-4BA9-AEFF-47C21CA11467@apache.org>
body_sha3_256: 85637822a7c46012435df73c12032aebd65c5a36689a5a8e9d768faf22ddc74b
- alternate: 2b3349da360a1ebfba7c7e84a923812451bedb0ee6df87609d8283e4705205f9
+ v0.10: 2b3349da360a1ebfba7c7e84a923812451bedb0ee6df87609d8283e4705205f9
+ foal: 2b3349da360a1ebfba7c7e84a923812451bedb0ee6df87609d8283e4705205f9
attachments: []
- index: 36
message-id: <E8CF05A0-0B7B-4A35-80C8-AC5C2D9F52D2@gmail.com>
diff --git a/yaml/parsing-httpd-users-200606-part.yaml b/yaml/parsing-httpd-users-200606-part.yaml
index d55d02b..261848f 100644
--- a/yaml/parsing-httpd-users-200606-part.yaml
+++ b/yaml/parsing-httpd-users-200606-part.yaml
@@ -1,70 +1,78 @@
-# The "alternate" values in here are where pony mail and foal differ due to different
-# handling of format=flowed.
args:
cmd: tests/test-parsing.py --generate parsing-httpd-users-200606-part.yaml --mbox corpus/httpd-users-200606-part.mbox
--rootdir ../ponymail/
parse_html: false
- env:
- ALT_VERSION: foal
parsing:
corpus/httpd-users-200606-part.mbox:
- index: 0
message-id: <BAY103-F28070ECF509B48E8F10ECEC2910@phx.gbl>
body_sha3_256: 944938a5297d49ad4336a818c06e57fff286efdcafdbafbeeac7d3f99b9eef3e
- alternate: d134d595e3e80d1c166e5f7a908ad340fe69fd44ddf5a03412e9850de5d88e69
+ v0.10: d134d595e3e80d1c166e5f7a908ad340fe69fd44ddf5a03412e9850de5d88e69
+ foal: d134d595e3e80d1c166e5f7a908ad340fe69fd44ddf5a03412e9850de5d88e69
attachments: []
- index: 1
message-id: <BAY117-F8A51AB1A746DB7C5C868BB4910@phx.gbl>
body_sha3_256: 422341bf16df7e41fb3bcafa1a92ccbea9f91ea74632adb2507d68cc7d54af73
- alternate: 47157d8e3a2e4207f03931c8b1921faea0ee00badad57f1c5778f72488aff890
+ v0.10: 47157d8e3a2e4207f03931c8b1921faea0ee00badad57f1c5778f72488aff890
+ foal: 47157d8e3a2e4207f03931c8b1921faea0ee00badad57f1c5778f72488aff890
attachments: []
- index: 2
message-id: <BAY103-F36A0C2427095C72D377474C2940@phx.gbl>
body_sha3_256: d225cbc5be1ca2be1a8f853970f231b62ec3330f0ee129f8ace48a9311d06d60
- alternate: 9e7880d7a364989708efd2def6f8cd6d2ba113f1f147777c59c429d29f2328ca
+ v0.10: 9e7880d7a364989708efd2def6f8cd6d2ba113f1f147777c59c429d29f2328ca
+ foal: 9e7880d7a364989708efd2def6f8cd6d2ba113f1f147777c59c429d29f2328ca
attachments: []
- index: 3
message-id: <BAY103-F115CA57A21C2C56030731CE2950@phx.gbl>
body_sha3_256: e80a63ec4a0351f0164b14e8775365ba09f718a6f890ee6ba1aad8ccb7e0e9ed
- alternate: 5ced4ee572e501479801915b353c36e62d56a2afe9b3af9e62a9294c26225ea8
+ v0.10: 5ced4ee572e501479801915b353c36e62d56a2afe9b3af9e62a9294c26225ea8
+ foal: 5ced4ee572e501479801915b353c36e62d56a2afe9b3af9e62a9294c26225ea8
attachments: []
- index: 4
message-id: <BAY103-F11410841CDE610A1EFC53E2950@phx.gbl>
body_sha3_256: dca5294e859b47aa37270e39c8f8db90adc00daa72641be59e7b9df57f5a01ba
- alternate: 2bc653922a805d4ff8754aec9e9313ca5fc7ce9e4fac3c804ab49e9fc434e8d0
+ v0.10: 2bc653922a805d4ff8754aec9e9313ca5fc7ce9e4fac3c804ab49e9fc434e8d0
+ foal: 2bc653922a805d4ff8754aec9e9313ca5fc7ce9e4fac3c804ab49e9fc434e8d0
attachments: []
- index: 5
message-id: <BAY103-F381B373856C3F8BAEF7649E2950@phx.gbl>
body_sha3_256: 39ada45824094734c91d797342f34490649a2ffd91cf7b50a72ad4d6b979f188
- alternate: 5d6b2225c3ea3d73707420f70d7d3a1e14eeca7ec319a930a3d36c4bb63949d3
+ v0.10: 5d6b2225c3ea3d73707420f70d7d3a1e14eeca7ec319a930a3d36c4bb63949d3
+ foal: 5d6b2225c3ea3d73707420f70d7d3a1e14eeca7ec319a930a3d36c4bb63949d3
attachments: []
- index: 6
message-id: <BAY103-F9B586FFD1CFE6D9112763E2950@phx.gbl>
body_sha3_256: 9513af448c11fe9a935cee3daae6e6b130a94f5f53840a0fff742a0707633b13
- alternate: 9636cfe97bac205f4babb50881b96cfd5200d2ebfdc90b69c0598b730c8d8b73
+ v0.10: 9636cfe97bac205f4babb50881b96cfd5200d2ebfdc90b69c0598b730c8d8b73
+ foal: 9636cfe97bac205f4babb50881b96cfd5200d2ebfdc90b69c0598b730c8d8b73
attachments: []
- index: 7
message-id: <BAY103-F802BFA93952CB192373C4E2950@phx.gbl>
body_sha3_256: 3cdb5195c0a06164e53d485fd82088a1a3bf36d35f4060d411d9694568dcc881
- alternate: 828891fc0949e439604bafa8d604713b6d1c0eb7eccb5dc691d8c6b444447de3
+ v0.10: 828891fc0949e439604bafa8d604713b6d1c0eb7eccb5dc691d8c6b444447de3
+ foal: 828891fc0949e439604bafa8d604713b6d1c0eb7eccb5dc691d8c6b444447de3
attachments: []
- index: 8
message-id: <BAY103-F40D7A4EF5AC184C9769209E2950@phx.gbl>
body_sha3_256: 1d09c99291191793f06aa041d6f4c32a17163ee129adb8ebf1a8275714f784cd
- alternate: eee54ccc869c7507b96bc29891820992688a55a2f19590f24f96ba537db490f9
+ v0.10: eee54ccc869c7507b96bc29891820992688a55a2f19590f24f96ba537db490f9
+ foal: eee54ccc869c7507b96bc29891820992688a55a2f19590f24f96ba537db490f9
attachments: []
- index: 9
message-id: <BAY103-F1C665A56AE3A65074D38DE2950@phx.gbl>
body_sha3_256: 90c4f6641980ad881385a3583f14d29849d1fd8061c6e899e105b0f12d6d89c2
- alternate: e91d6412dc82e2f8e43198a0d994d9a68735586fa7e823594f77ec8abdd7aca3
+ v0.10: e91d6412dc82e2f8e43198a0d994d9a68735586fa7e823594f77ec8abdd7aca3
+ foal: e91d6412dc82e2f8e43198a0d994d9a68735586fa7e823594f77ec8abdd7aca3
attachments: []
- index: 10
message-id: <BAY103-F192188E821DBDA96D8C790C27E0@phx.gbl>
body_sha3_256: 44f3ce8f1438a1de5f9e763ff0ab6fa8d2375accfe5ca589f777304f24e6f109
- alternate: c753a28b83d1269b8e35e3dfa83abb1d0e0b9f7bb9bc4acdbdb50ab195d2d4d2
+ v0.10: c753a28b83d1269b8e35e3dfa83abb1d0e0b9f7bb9bc4acdbdb50ab195d2d4d2
+ foal: c753a28b83d1269b8e35e3dfa83abb1d0e0b9f7bb9bc4acdbdb50ab195d2d4d2
attachments: []
- index: 11
message-id: <BAY103-F40786C94EB9152F563E277ED720@phx.gbl>
body_sha3_256: 1312c69e645b07b003ade1c024f2631f1ac2b92f9766eac1db8dd4f50769a544
- alternate: 4ee07e7b4025839b579a3e656f35c46335ab127dfaa9b84fcdfb9091f0f88e37
+ v0.10: 4ee07e7b4025839b579a3e656f35c46335ab127dfaa9b84fcdfb9091f0f88e37
+ foal: 4ee07e7b4025839b579a3e656f35c46335ab127dfaa9b84fcdfb9091f0f88e37
attachments: []
