diff options
author | Chris Wilson <chris+github@qwirx.com> | 2014-03-02 08:58:18 +0000 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2014-03-02 08:58:18 +0000 |
commit | 3552ccc25938288775d56adf70b8bf0dc8b63563 (patch) | |
tree | 2dbeaa7900c5c4aca3bf4b213052db3caa7c7428 /test | |
parent | e0470bd4b13806d8b4274d1ecaa08514af955074 (diff) |
Adding a directory when over limit returns an error instead of crashing.
Just like adding a file does.
Diffstat (limited to 'test')
-rw-r--r-- | test/backupstore/testbackupstore.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/test/backupstore/testbackupstore.cpp b/test/backupstore/testbackupstore.cpp index a907e8dc..300a666b 100644 --- a/test/backupstore/testbackupstore.cpp +++ b/test/backupstore/testbackupstore.cpp @@ -2310,27 +2310,26 @@ bool test_account_limits_respected() std::auto_ptr<IOStream> upload(BackupStoreFile::EncodeFile("testfiles/test3", BackupProtocolListDirectory::RootDirectory, fnx, &modtime)); TEST_THAT(modtime != 0); - TEST_CHECK_THROWS(std::auto_ptr<BackupProtocolSuccess> stored(protocol.QueryStoreFile( + TEST_CHECK_THROWS(protocol.QueryStoreFile( BackupProtocolListDirectory::RootDirectory, modtime, modtime, /* use it for attr hash too */ 0, /* diff from ID */ fnx, - upload)), + upload), ConnectionException, Conn_Protocol_UnexpectedReply); // This currently causes a fatal error on the server, which // kills the connection. TODO FIXME return an error instead. std::auto_ptr<IOStream> attr(new MemBlockStream(&modtime, sizeof(modtime))); BackupStoreFilenameClear fnxd("exceed-limit-dir"); - TEST_CHECK_THROWS(std::auto_ptr<BackupProtocolSuccess> dirCreate( - protocol.QueryCreateDirectory( + TEST_CHECK_THROWS(protocol.QueryCreateDirectory( BackupProtocolListDirectory::RootDirectory, - 9837429842987984LL, fnxd, attr)), - ConnectionException, TLSReadFailed); + 9837429842987984LL, fnxd, attr), + ConnectionException, Conn_Protocol_UnexpectedReply); // Finish the connection. TODO FIXME reinstate this. - // protocol.QueryFinished(); + protocol.QueryFinished(); } tearDown(); |