Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge ejabberd_tests into MongooseIM repo #482

Merged
merged 7 commits into from
Sep 11, 2015
Merged

Merge ejabberd_tests into MongooseIM repo #482

merged 7 commits into from
Sep 11, 2015

Conversation

erszcz
Copy link
Member

@erszcz erszcz commented Aug 7, 2015

Accompanying branch tests-master is a direct import of ejabberd_tests done according to Git Tools - Subtree Merging. In merge-tests the entire tests history is squashed into a single commit, therefore to keep test development history we need to keep tests-master. Please note the merge required some manual intervention, git wasn't able to do it automagically.

Local tests pass without issues. Directory structure is not modified from the way it was with tests as a rebar dependency.

erszcz added 6 commits August 6, 2015 17:35
This doesn't work anyway after merge into MongooseIM repo.
Just use `make quicktest PREPARE= TESTSPEC=default.spec`,
i.e. assign an empty value to variable `PREPARE`.

(cherry picked from commit ejabberd_tests @ 19ac15b)

See esl/ejabberd_tests#126.
Describe just the basics. To do (just ideas):

-   server presets / restart infrastructure
-   coverage statistics
-   dynamic modules / server feature detection
-   passing options to / extending run_common_test.erl
aszlig added a commit to headcounter/deployment that referenced this pull request Aug 29, 2015
This is for supporting older MongooseIM versions (in our case 1.5.1),
because we've updated the ejabberd_tests test suite to the latest
upstream master (in 03a49a4) so we need to revert a few changes.

Hopefully we shouldn't need that anymore after esl/MongooseIM#482 has
been merged.

Signed-off-by: aszlig <[email protected]>
@pzel
Copy link
Contributor

pzel commented Sep 11, 2015

pzel added a commit that referenced this pull request Sep 11, 2015
Merge ejabberd_tests into MongooseIM repo
@pzel pzel merged commit 65386d8 into master Sep 11, 2015
@michalwski michalwski mentioned this pull request Oct 15, 2015
@michalwski michalwski deleted the merge-tests branch November 30, 2015 07:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants