Cloud storage: second merge test, delete dive on one side, modify on other

Delete a dive while offline, modify it from a different system while
online. Then resync.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-08-24 16:23:21 -07:00
parent a2c638f63f
commit 72817ff47f
2 changed files with 97 additions and 33 deletions

View file

@ -7,10 +7,12 @@ class TestGitStorage : public QObject
{
Q_OBJECT
private slots:
void testSetup();
void testGitStorageLocal();
void testGitStorageCloud();
void testGitStorageCloudOfflineSync();
void testGitStorageCloudMerge();
void testGitStorageCloudMerge2();
};
#endif // TESTGITSTORAGE_H