test-server-utils: Allow reuse of existing addressbook.
authorTristan Van Berkom <tristanvb@openismus.com>
Fri, 19 Apr 2013 10:48:08 +0000 (19:48 +0900)
committerTristan Van Berkom <tristanvb@openismus.com>
Tue, 23 Apr 2013 11:20:46 +0000 (20:20 +0900)
commit21986669ffde19ffff4813cbf941d0585beff268
tree3146c069ad4def3c6bed6a046eef92011a2a91fd
parent111d17517af7cbcbae13e8d7a3c5c86f796ef4b8
test-server-utils: Allow reuse of existing addressbook.

If committing the new scratch source ends with an error that
the addressbook/calendar already exists, then just use the existing
source instead of bailing out.

This is needed for tests which reuse the addressbook from a previous test.

Conflicts:

tests/test-server-utils/e-test-server-utils.c
tests/test-server-utils/e-test-server-utils.c