diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2015-08-24 16:23:21 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2015-08-25 10:44:30 -0700 |
| commit | 72817ff47f8a990aa043603ebe2d3ead1ff811c9 (patch) | |
| tree | c78060a73c0a678544303b3841c8cddd5501188e /tests/testgitstorage.h | |
| parent | a2c638f63fd94861e60d8dfdad517e6e14785d9f (diff) | |
| download | subsurface-72817ff47f8a990aa043603ebe2d3ead1ff811c9.tar.gz | |
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>
Diffstat (limited to 'tests/testgitstorage.h')
| -rw-r--r-- | tests/testgitstorage.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/testgitstorage.h b/tests/testgitstorage.h index 93cf70177..d5f69fc65 100644 --- a/tests/testgitstorage.h +++ b/tests/testgitstorage.h @@ -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 |