Merge upstream master 20151222#2
Open
JeetKunDoug wants to merge 59 commits into
Open
Conversation
Add Erlang 17.0 to the test matrix
…g the execution of tests when using erlang.mk and meck as a test dependency.
…m.make.all Removed test and doc from target all in Makefile
Fix variable exported from case
Full version: rebar 2.5.1 R15B03 20141014_122343 git 2.5.1-19-g9c7dae7
This prevents warnings about unknown functions in the erlang module.
Allow hiding 'on_load' attribute.
Running tests was removed from make target all in eproxus@30a116a7
Run tests in travis
Meck used to have 'namespaced_dict' while Hamcrest recently introduced a similar macro, 'namespaced_types' for the same purpose. In OTP 18.0 the affected non-namespaced types were completely removed and using them results in a compile error instead of deprecation wagning in 17. So hamcrest.hrl relies on the precense of 'namespaced_types' macro to use the right type. Meck's test module meck_tests.erl includes this header so the 'namespaced_types' macro also have to be defined in meck's test.config. To eliminate duplication I chose to unite the above two macros and use the more generic 'namespaced_types' name.
In order to avoid creating temporary files meck_cover needs direct access to some unexported functions of cover. In OTP 18.0 the internal API of cover changed a bit and compile_beam/2 (which allows passing a binary instead just a filename) was replaced by compile_beams/1. See erlang/otp@ab435488
Update for OTP 18.0
The string "An exception printed by SASL" was changed to "En exception
printed by SASL" ("An" => "En") during a reformatting of the text in
2011 via
eproxus@51ecfb4#diff-04c6e90faac2675aa89e2176d2eec7d8L39
This reverts the spelling of "an".
Turns out that we can't rely on the current working directory always staying the same. The real world scenario is when Meck is cleaning up after the last failed test case and Rebar changes directory from the .eunit folder to the project root. Meck now stores absolute paths to cover backup files.
This reverts commit d0a3e5b.
Expectations set for a function do not apply to local invocations of that function. This may not be obvious for first-time users
Document the caveat with mocking module-local calls.
…tion Fix race condition between meck:unload/1 and calls to the mocked module
Filter out optional_callbacks attributes
'Problematic modules' list now includes global
Update 'problematic modules list'
The expectations are merged for the function/arity instead of replacing the existing one
Add merge_expects option
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
DO NOT MERGE: This is a first attempt at pulling all changes from eproxus/master to our branch. Will be used post-2.2, and may need to be updated once we're ready for it.
Currently merges/tests cleanly.