Backup_Repos/beets
1
0
Fork 0
mirror of https://github.com/beetbox/beets.git synced 2025-12-17 22:23:16 +01:00
Code Issues Projects Releases Wiki Activity
9149 commits 44 branches 64 tags 64 MiB
Commit graph

2159 commits

Author SHA1 Message Date
Carl Suster
de6718abdf bpd: separate tests by command category 2019-04-01 14:49:27 +11:00
Carl Suster
bed89df69a Fix test_ui:test_version under pytest 
The test `CommonOptionsParserCliTest.test_version` was passing with nose
but failing with pytest (see output below). The reason for the failure
seemed to be that the `test` plugin was loaded when it wasn't expected
to be loaded, changing the output of the `version` command. I'm not sur
exactly why that was happening, but since that test already inherited
from `TestHelper`, just invoking the plugin load/unload helper was
enough to fix it. I also removed the line setting the `self.lib`
variable since that's already done in the helper.

---

self = <test.test_ui.CommonOptionsParserCliTest testMethod=test_version>

    def test_version(self):
        l = self.run_with_output(u'version')
        self.assertIn(u'Python version', l)
>       self.assertIn(u'no plugins loaded', l)
E       AssertionError: 'no plugins loaded' not found in 'beets version 1.4.8\nPython version 3.7.3rc1\nplugins: test\n'

test/test_ui.py:1292: AssertionError
 2019-03-31 20:22:44 +11:00
Carl Suster
999cf14401 BPD tests: change expectedFailure -> skip for nose 2019-03-31 10:50:42 +11:00
Carl Suster
2e35c27dce BPD tests: improve helpers 2019-03-31 10:46:14 +11:00
Carl Suster
eb5c7513a1 BPD tests: fix GstPlayer mock 2019-03-31 10:46:14 +11:00
Carl Suster
2a2d9b5c98 BPD tests: explicitly close client socket 2019-03-31 10:46:14 +11:00
Carl Suster
a6c976b880 BPD tests: small code reformatting 2019-03-31 10:46:14 +11:00
Carl Suster
3eaf0f7a19 BPD tests: use canonical capitalisation of tags 2019-03-31 10:46:14 +11:00
Carl Suster
4c627cbacb [skip travis] BPD tests: add items by path 2019-03-31 10:46:14 +11:00
Carl Suster
dfc5da70cd BPD tests: avoid os.fsdecode new in Py3.2 2019-03-31 10:46:14 +11:00
Carl Suster
14d0cc3b85 BPD tests: be more careful with paths 2019-03-31 10:46:14 +11:00
Carl Suster
7c8bbd3011 BPD tests: avoid Py3.7-only mp.Process.kill 2019-03-31 10:46:14 +11:00
Carl Suster
35bf041ad0 BPD tests: fork and launch beets 2019-03-31 10:46:14 +11:00
Carl Suster
c42c0c06bc BPD tests: fix CI failures 2019-03-31 10:46:14 +11:00
Carl Suster
2286c0ce7b BPD tests: run bpd in a subprocess 2019-03-31 10:46:14 +11:00
Carl Suster
767441d5d5 BPD tests: improve test helpers 
Decode the bytes to strings: the MPD protocol specifies that the
communications are all in UTF-8.

Also parse the body into a dict since this is typically more convenient
than having to do it manually in each test.
 2019-03-31 10:46:14 +11:00
Carl Suster
d9537f27dc BPD tests: fix CI failures 2019-03-31 10:46:14 +11:00
Carl Suster
76221428f8 Add a DummyIn::close no-op implementation 
The BOD tests are currently forking a process with a server running, and
this attempts to close stdin. Tests were failing due to DummyIn not
implementing the close() method. Adding this simple no-op does the trick
to allow forking and seems like a harmless addition.
 2019-03-31 10:46:14 +11:00
Carl Suster
5d2b883b72 BPD tests: test several simple commands 2019-03-31 10:46:14 +11:00
Carl Suster
7302cd6ab5 BPD tests: test helper for BPD batch commands 
The MPD protocol allows batching commands. There are two choices for the
first message that announced a batch is starting, and we just go for the
one that causes the server to respond with a marker message between each
individual response, since that's easier. This might need to be tweaked
in order to test the behaviour with the other batch indicator.
 2019-03-31 10:46:14 +11:00
Carl Suster
9a5be1f971 BPD tests: test supported tag types 
MPD now supports more fields ("tags") than what BPD advertises. Fixing
this should be a simple task of extending the mapping of fields to tags
in BPD's implementation.
 2019-03-31 10:46:14 +11:00
Carl Suster
acd66ce560 BPD tests: run BPD Server with a fake gstplayer 2019-03-31 10:46:14 +11:00
Carl Suster
acc3f3efb0 BPD tests: check all specified commands known 
The current MPD spec is several versions ahead of BPD. These tests just
compare the full specified list of commands against what BPD claims to
support (without actually testing their implementations). It's handy as
a measure of progress against the specification, but can perhaps be
dropped later once all of the individual protocol methods have tests.
 2019-03-31 10:46:14 +11:00
Carl Suster
59e66aaa7f BPD tests: password command 2019-03-31 10:46:14 +11:00
Carl Suster
078c583434 BPD tests: add basic test framework 
A simple TCP client wraps the low level protocol to allow testing of the
BPD server as a black box.
 2019-03-31 10:46:14 +11:00
jroitgrund@gmail.com
ea307f62d1 Don't move album art twice 2019-03-27 01:41:42 +00:00
Jack Wilsdon
25549a656f
Add test for interpolating byte strings in hook plugin 2019-02-25 14:42:20 +00:00
Adrian Sampson
81c5ae3fdf
Merge pull request #3151 from Holzhaus/playlist-plugin-additions 
playlist: Add auto-update functionality and more tests
 2019-02-18 08:40:55 -05:00
Jan Holthuis
76a3e44aad test: Make music dir of playlist tests Windows-compatible 2019-02-17 21:27:37 +01:00
Jan Holthuis
7ec55a5f3b test: Use unicode literals for library queries in playlist tests 2019-02-17 21:27:09 +01:00
Jan Holthuis
a9dd5a7cdc test: Add testcase for playlist plugin's update functionality 2019-02-17 20:31:15 +01:00
Adrian Sampson
7edba6e9ea Fix test harness for named queries 2019-02-17 14:11:40 -05:00
Jan Holthuis
1af82cc450 test: Split up playlist test helper class 2019-02-17 19:41:37 +01:00
Adrian Sampson
d8e167637e Prototype support for named (pseudo-field) queries 
As discussed here:
https://github.com/beetbox/beets/pull/3145#pullrequestreview-204523870

This would replace the need for #3149.
 2019-02-17 13:41:05 -05:00
Jan Holthuis
5b68d88346 test: Add more playlist tests for the different relative_to settings 2019-02-17 19:36:26 +01:00
Jan Holthuis
9f3acce2ae test: Add non-existing item to playlist tests 2019-02-17 19:35:54 +01:00
Jan Holthuis
b00b38dab6 test: Add test for relative playlists 2019-02-17 19:35:43 +01:00
Jan Holthuis
14cad04d35 test: Further improve Windows compatibility in playlist plugin test 2019-02-17 19:33:54 +01:00
Adrian Sampson
00667bda0f Merge pull request #3145 from Holzhaus/playlist-plugin 
Playlist plugin
 2019-02-17 13:16:26 -05:00
Jan Holthuis
d6022e28d7 test: Ensure path quoting in playlist tests 2019-02-17 16:43:36 +01:00
Jan Holthuis
31c687c853 test: Fix playlist plugin path handling for Windows compatibility 2019-02-17 16:17:47 +01:00
Jan Holthuis
32b6df046e test: Don't use unix-only paths in playlist plugin testcase 2019-02-17 15:57:40 +01:00
Jan Holthuis
d4039be9c0 test: Get rid of TemporaryDirectory to restore Python 2.7 compatibility 2019-02-17 15:39:47 +01:00
Jan Holthuis
d52dcdd48f test: Add playlist testcases for nonexisting playlists 2019-02-17 15:17:10 +01:00
Jan Holthuis
0988a2a186 test: Add test suite for the playlist plugin 2019-02-17 15:17:10 +01:00
Rahul Ahuja
7b57b0b608 Appease Flake8 2019-01-22 10:53:18 -08:00
Rahul Ahuja
3a67eae46d Use track attrs directly, better naming/docstrings 2019-01-22 10:41:18 -08:00
Rahul Ahuja
77f9a930b7 Fix remaining test, use official doc wording 2019-01-21 23:15:08 -08:00
Rahul Ahuja
0527edbd48 Fix test index, add docstrings 2019-01-21 23:05:47 -08:00
Rahul Ahuja
2cda2b5b3a Remove hardcoded ordering of filters in tests 2019-01-21 22:53:23 -08:00
Rahul Ahuja
237792a4fb Fix other test_track_request case 2019-01-21 22:40:15 -08:00
Rahul Ahuja
f63beca39a Switch filter ordering in test 2019-01-21 22:35:12 -08:00
Rahul Ahuja
5472a49991 Add candidates and item_candidates, modularize Search API queries 2019-01-21 21:24:41 -08:00
Adrian Sampson
1087740580
Merge pull request #3100 from regagain/fetchart_unittests 
Unit tests for fetchart plugin iTunes source
 2019-01-21 18:19:08 -05:00
Reg
272bf5940b test_art/iTunesStore: log check fix. 2019-01-21 22:49:19 +01:00
Reg
1be3c954f3 test_art/iTunesStore: Python2 string fix. 2019-01-21 18:26:58 +01:00
Reg
ce35c36762 test_art/iTunesStore: Verify logs. 2019-01-20 23:09:18 +01:00
Rahul Ahuja
b95eaa8ffe fix test, document Spotify ID 2019-01-20 02:20:10 -08:00
Rahul Ahuja
9a30000b56 better naming, formatting 2019-01-20 02:04:46 -08:00
Rahul Ahuja
104f6185ab revert unnecessary double --> single quotes 2019-01-19 23:57:36 -08:00
Rahul Ahuja
337cf2a1c3 appease Flake8 2019-01-19 23:35:06 -08:00
Rahul Ahuja
dc77943da2 try oauth token mock 2019-01-19 23:21:02 -08:00
Reg
088b5b173d test_art/iTunesStore: Check match level is as expected 2019-01-19 14:58:41 +01:00
Reg
57c27039d6 test_art/iTunesStore: renamed test for clarity 2019-01-12 19:54:49 +01:00
Reg
fa32485755 test_art/iTunesStore: requestexception test improvements 2019-01-10 20:03:32 +01:00
Reg
ac09c480c9 test_art/iTunesStore: removed unnecessary statement and renamed test 2018-12-27 09:44:04 +01:00
Reg
5d1c97824c Unit tests for fetchart plugin iTunes source 2018-12-23 17:48:44 +01:00
Reg
f955f72e2c test_fetchart: Fix for hidden files on Windows 2018-12-21 11:27:09 +01:00
Reg
54a83fa941 Fetchart / ignore settings tests 2018-12-20 18:44:55 +01:00
Reg
0696f915e5 test_fetchart: Avoid duplicate code in future tests. 2018-12-20 18:44:55 +01:00
Adrian Sampson
ca359d7e0d
Merge pull request #3085 from jackwilsdon/modify-skip-remaining 
Allow exiting object selection early
 2018-12-02 14:57:16 -05:00
Guilherme Danno
fa1037ee28
Enhance %title (#3059) 
Use string.capwords in %title to lower char after apostrophe
 2018-11-29 11:30:48 -02:00
Jack Wilsdon
bed3abd97a
Allow exiting object selection early 2018-11-28 17:17:12 +00:00
Adrian Sampson
0a74e0fd3f Style fixes for latest pycodestyle changes 2018-10-24 17:05:38 -04:00
David Logie
27f0b57d2b Remove pointless print call. 2018-10-10 15:40:21 +01:00
Jack Wilsdon
5ad16983d4
Fix miscellaneous typos 2018-10-09 01:11:06 +01:00
David Logie
932609933f Allow "deleting" fixed attributes via beet modify. 
Deleting a fixed field isn't possible so we just reset the
field back to it's "null" value.

Fixes #2497.
 2018-09-27 11:22:17 +01:00
Adrian Sampson
62772ceece Merge branch 'master' into arogl-master 2018-09-16 20:56:17 -04:00
Adrian Sampson
dc45119a8d Avoid comparing patterns in a test 
As pointed out here:
https://github.com/beetbox/beets/pull/3028#issuecomment-420257867
 2018-09-16 20:52:31 -04:00
Andrew Rogl
919f3f9c34 mbsync no longer queries MusicBrainz when the either the mb_albumid or mb_trackid field is invalid 2018-09-09 15:20:26 +10:00
Adrian Sampson
3ddf3ef58a
Merge pull request #3022 from beetbox/default-ignore-data-tracks 
Make `ignore_data_tracks` `yes` by default
 2018-09-05 23:13:44 -04:00
Filipe Fortes
2b41775b8a Fix tests 2018-09-05 11:37:54 -04:00
David Logie
57b268923f Split release and release-group disambiguation into separate fields. 2018-09-05 12:45:19 +01:00
Filipe Fortes
692060cc0a Re-order tests 2018-09-04 11:33:07 -04:00
Filipe Fortes
1701aefe5c Make ignore_data_tracks yes by default 2018-09-04 10:04:17 -04:00
Filipe Fortes
210b9d316f Allow ignoring of audio data tracks on import 2018-09-02 10:09:10 -04:00
Adrian Sampson
142aeb6822
Merge branch 'master' into 2972-from-scratch-keep-immutable 2018-07-02 15:18:38 -04:00
Zsin Skri
77242d6b2b add test: from_scratch only removes writeable 
Tests for commit ba8fcdfd from_scratch import: only remove writable fields.
 2018-07-01 20:23:41 +02:00
Zsin Skri
154e6cfca8 improve tests prefer_specific without canonical 
This improves the tests for the changes introduced in
commit cef9a331 LastGenre: allow prefer_specific without canonical.
 2018-07-01 09:19:36 +02:00
Zsin Skri
96120d5c6d LastGenre test: prefer_specific without canonical 
This tests commit cef9a331.
 2018-06-30 22:38:56 +02:00
Zsin Skri
0f847aefcb LastGenre tests: setup_config: add prefer_specific 
Allow to specify prefer_specific in lastgenre tests configuration setup.
 2018-06-30 22:37:28 +02:00
Iliana Weller
d1d745a58e
Test {album,track}info_received sends in mbsync 2018-05-09 21:46:57 -07:00
Jérémie Detrey
b12b4a1998 mbsync: Add unit test for recording MBID change. 2018-05-08 17:17:23 +02:00
Jérémie Detrey
81e1fc1a7e test.helper: Allow extra track values in generate_album_info. 2018-05-08 17:02:38 +02:00
Jérémie Detrey
f01799207a Add mb_releasetrackid tag to full.* media files. 2018-05-01 08:37:34 +02:00
Jérémie Detrey
9f4c5c8096 Do not rely on positional arguments for TrackInfo. 2018-04-30 18:37:27 +02:00
Jérémie Detrey
f74899ab9a Fix errors due to missing track['id'] in unit tests. 2018-04-30 18:26:06 +02:00
Jérémie Detrey
3e3a51dbb1 Merge branch 'feature/406' of github.com:Rawrmonkeys/beets into feature/406 2018-04-30 11:26:10 +02:00
Jérémie Detrey
c1d1388729 Unit test for import with video data tracks. 2018-04-29 20:19:11 +02:00
Jérémie Detrey
e88a7cea90 Unit test for import with audio data tracks. 2018-04-29 20:06:44 +02:00
Adrian Sampson
4288e11fc0
Merge pull request #2891 from dbogdanov/discogs_fixes 
Some fixes and updates for the Discogs plugin
 2018-04-28 14:32:27 -04:00
Adrian Sampson
8eb50fee33 Avoid weird mutation in web tests 
This was strange and unnecessary---setting a field on the response
object instead of just using a local variable---and also broke on Flask
1.0.
 2018-04-27 17:34:18 -04:00
Dmitry Bogdanov
676536efa7 Fix incorrect indexing of two-sided mediums 
Fix incorrect split of a tracklist by medium for the case of
two-sided mediums (#2887).

Following the discussion in #2887, the 'medium_total' value should
contain the number of tracks on the medium to which each particular
track belongs, not the total number of different mediums present on
a release.

Fix unit tests accordingly.
 2018-04-27 19:28:35 +02:00
Denis Defreyne
0202d762bf
Add artist_credit config option 2018-04-08 08:29:06 +02:00
Rawrmonkeys
0f6f0391fd add tag, database entry, data population for musicbrainz release track id 2018-03-25 18:58:04 -07:00
Adrian Sampson
492ff7359a Set up date tests for #2652 2018-02-20 22:57:58 -05:00
Adrian Sampson
9577a511cb Update tests for new Unidecode behavior: fix #2799 
The library has started putting spaces around the expanded versions of
vulgar fraction characters.
 2018-01-30 20:50:43 -05:00
Nicolas Guillaumin
816de1c3da Rename setting to ignored_media for consistency 2018-01-02 15:04:00 -08:00
Nicolas Guillaumin
22c4f9cb97 Added a setting to control which formats are ignored 
This is related to #2688 where a list of hard-coded non-audio formats to
ignore has been added. Some users may want to rip the audio portion of
video tracks (e.g. DVD-Video) so it would be beneficial to let them
control exactly which formats to ignore.

I added a `ignored_formats` setting for that purpose and moved the
hard-coded list into the config. Test and documentation have been
updated accordingly.

Aside: I also clarified the changelog a bit regarding this change and
the related one for #1210.
 2018-01-02 11:03:02 -08:00
Nicolas Guillaumin
d325bceb1d Added a setting to control if video tracks are ignored 
Users may want to keep tracking video tracks, for example if they rip
the audio part of the video tracks. Added a setting to allow this.
 2017-12-31 10:46:48 -08:00
Nicolas Guillaumin
71b4d5c702 Fixes #1210: Skip non-audio tracks from MusicBrainz 
This ignores non-audio tracks during import:
- Data tracks, based on their title `[data track]` (which seems to be
the MusicBrainz convention, as there's no specific flag to indicate
that a track is a data one),
- Video tracks, based on the `video=true` attribute.

It's similar to the Picard changes mentioned in #1210, except it doesn't
deal with `[silence]` tracks: These ones will probably require a setting
to let the user control if they should be imported or not.
 2017-12-30 19:20:43 -08:00
Nicolas Guillaumin
3b491ce9b4 Fixes #2688: Skip non-audio media from MusicBrainz 
Some releases have non-audio media, such as CD+DVD or CD+DVD-Video. Skip
these media when fetching album info as they will never match audio
tracks and will always report missing tracks.

I took the naive approach of cherry-picking a list of media suspected to
not contain audio from the MusicBrainz formats list:

https://musicbrainz.org/doc/Release/Format
 2017-12-30 13:29:37 -08:00
tummychow
e848adab04 Implement from_scratch option 
Fixes #934, and also helps with #1173.
 2017-12-07 14:46:40 -05:00
Sebastian Reuße
c40ea4f22a mediafile._safe_cast: be safer when converting to int 
The regex «[\+-]?[0-9]*» possibly matches a single minus/plus, which would then
be passed on to int(), raising a ValueError from within _safe_cast. The test
suite covered this for float, but not for int.

We now make sure we actually have a number after the sign by using a Kleene
plus.
 2017-11-19 09:21:07 +01:00
Meet Udeshi
70f0bc5b6c Implement album merging for duplicates 
Fixes #112
 2017-11-01 02:00:48 +05:30
konman2
578143ae12 updated to pass pep8 checks 2017-10-07 21:28:33 -07:00
konman2
fdeef05cc9 clearart asks for permission before deleting embedded albumart 2017-10-07 20:42:01 -07:00
zigarrre
b376139663 Refactored move functions for clarity according to #2682 
The move functions in library.py and manipule_files in importer.py where
changed to use a single parameter for the file operation instead of
multiple boolean flags.

A typo in the documentation of the Album.move and Item.move functions
confusing True and False when describing the store parameter was fixed
as well.
 2017-09-11 17:03:44 +02:00
euri10
25fb2453b4 Modified the name of the fetchart plugin switch from missing to quiet 2017-09-05 18:27:47 +02:00
euri10
b2fd274e2c Added a missing switch to the fetchart command so that only missing albums 
are displayed
 2017-09-05 16:34:26 +02:00
wordofglass
8833fef249 Merge pull request #2668 from wordofglass/edit_logic 
Edit plugin logic: Regression from previous PR; incorrect diffs
 2017-08-25 15:52:40 +02:00
wordofglass
5f21bd3ccd test_edit: Add a test for retagging. 2017-08-24 15:03:18 +02:00
wordofglass
b903b44a0c test_edit: Fix test that intended to change one item but affected two. 
This didn't manifest as a testing failure since the plugin (mostly
silently) drops id changes.
 2017-08-22 23:34:35 +02:00
wordofglass
c811102eb2 test_edit: Expect mtime to change, unbreaks the multiple-item tests. 2017-08-22 23:34:06 +02:00
wordofglass
18c82cab5f test_edit: Add a comment explaining why I didn't change the writing behaviour 
I was midway through writing a test when realizing that it's best
the way it is...
 2017-08-22 23:24:33 +02:00
wordofglass
7d4627bb8f Ensure mtime is non-zero for Items in test fixtures. 
mtime == 0 is the "this Item contains newer metadata than the file's
tags" marker. Setting this to something else than 0 emulates the state
of Items freshly read from the database.

Breaks 4 of the edit plugin tests.
 2017-08-22 23:24:33 +02:00
Antoine Beaupré
914dba4152
add tests for slug function, failing 2017-07-18 16:32:47 -04:00
Adrian Sampson
8085d1318b Fix ipfs test to sort items in order 2017-06-20 16:19:31 -04:00
Adrian Sampson
2a9be17cf6 Fix some brittle query tests 
These were written to incidentally depend on Nones; the behavior they're
actually testing doesn't really have anything to say about None-ness.
 2017-06-20 15:56:33 -04:00
euri10
6664b656f4 Merge branch 'relativedate' 
Solved conflicts with upstream of new parse classmethod of DateQuery

# Conflicts:
#	beets/dbcore/query.py
 2017-06-15 08:59:43 +02:00
Adrian Sampson
ace5656e36 Complete set of __future__ imports 2017-06-14 19:08:27 -04:00
A.L. Kleijngeld
2eb4e3d515 Merge branch 'master' into master 2017-06-13 14:43:10 +02:00
Bart Kleijngeld
762f9ca054 revised to fix flake8 warnings 2017-06-13 14:33:08 +02:00
Adrian Sampson
dfde9ce916 Merge pull request #2510 from SpirosChadoulos/master 
New export command (issue #435)
 2017-06-11 12:21:06 -04:00
Adrian Sampson
389aed8d5d Merge pull request #2528 from discopatrick/query-datetime-parser 
Query datetime parser
 2017-06-10 20:57:29 -04:00
Adrian Sampson
15a7dfccff Merge pull request #2583 from yacoob/master 
Fix a lastgenre crash
 2017-06-10 20:47:19 -04:00
Adrian Sampson
0e47095bb0 Merge pull request #2560 from autrimpo/r128 
RFC: replaygain: R128 support
 2017-06-10 20:32:42 -04:00
Adrian Sampson
ca4f96e33c Consolidate export tests into MoveTest 
Just one new flag.
 2017-06-10 20:26:41 -04:00
Adrian Sampson
730c84e5e5 Correct tests for export mode 
The old tests were wrong but the incorrectness was hidden by the incorrect
parameter passing fixed in the previous commit. Now we actually test that the
item's path did not change.
 2017-06-10 20:25:48 -04:00
Adrian Sampson
714560aace Fix parameter order and binding 
The calls didn't match up with the parameter order.
 2017-06-10 20:19:27 -04:00
Adrian Sampson
b25eb87f60 Remove unnecessary output capture 2017-06-10 20:05:17 -04:00
Adrian Sampson
29d6c27d02 Fix some spurious whitespace changes 2017-06-10 20:03:01 -04:00
discopatrick
291b287f56 Add a test for a non-range date query 2017-06-05 16:31:37 +01:00
Jakub Turski
f6830b4bc3 Here, flake8, be happy. 2017-06-02 16:27:49 +01:00
Jakub Turski
0e7a0a62d4 Fix excessive line length. 2017-06-02 16:04:05 +01:00
Jakub Turski
a43f5fdace Remove unnecessary test setup parameter. 2017-06-02 15:50:58 +01:00
Jakub Turski
ee46a5150f Don't crash if non-canonical genre and prefer_specific: yes. 
Also, add a test for this.
 2017-06-02 15:48:05 +01:00
discopatrick
e1101d4e95 Update assertion with correct error name 2017-06-01 12:33:23 +01:00
Bart Kleijngeld
c64878179e finished tests for set_fields on importer 2017-06-01 11:57:24 +02:00
discopatrick
fbb868e5ed Merge branch 'master' into query-datetime-parser 2017-06-01 04:37:45 +01:00