Skip to content

Cleanup files uploaded #266

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.

Sign up for GitHub

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

Merged
etr merged 4 commits into from
Apr 12, 2022
+37 −18
Merged

Cleanup files uploaded #266

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
283f73c
http_request: Remove uploaded files in destructor
LeSpocky Apr 7, 2022
a19cf96
test: integ: file_upload: Remove redundant file delete
LeSpocky Apr 8, 2022
a74cc13
test: integ: file_upload: Check uploaded files are deleted
LeSpocky Apr 8, 2022
0c18064
test: integ: file_upload: Stop webserver earlier
LeSpocky Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: integ: file_upload: Check uploaded files are deleted
  • Loading branch information
@LeSpocky
LeSpocky committed Apr 8, 2022
commit a74cc132c5cbcc51d1c45edff6c2aab3b1751f2c
11 changes: 11 additions & 0 deletions test/integ/file_upload.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@ static size_t TEST_CONTENT_SIZE_2 = 28;
static const char* TEST_PARAM_KEY = "param_key";
static const char* TEST_PARAM_VALUE = "Value of test param";

static bool file_exists(const string &path) {
struct stat sb;

return (stat(path.c_str(), &sb) == 0);
}

static CURLcode send_file_to_webserver(bool add_second_file, bool append_parameters) {
curl_global_init(CURL_GLOBAL_ALL);

Expand Down Expand Up @@ -216,6 +222,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_memory_and_disk)
httpserver::http::http_utils::upload_filename_template;
LT_CHECK_EQ(file->second.get_file_system_file_name().substr(0, file->second.get_file_system_file_name().size() - 6),
expected_filename.substr(0, expected_filename.size() - 6));
LT_CHECK_EQ(file_exists(file->second.get_file_system_file_name()), false);

ws->stop();
delete ws;
Expand Down Expand Up @@ -300,6 +307,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_memory_and_disk_additional_par
httpserver::http::http_utils::upload_filename_template;
LT_CHECK_EQ(file->second.get_file_system_file_name().substr(0, file->second.get_file_system_file_name().size() - 6),
expected_filename.substr(0, expected_filename.size() - 6));
LT_CHECK_EQ(file_exists(file->second.get_file_system_file_name()), false);

ws->stop();
delete ws;
Expand Down Expand Up @@ -353,6 +361,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_memory_and_disk_two_files)
httpserver::http::http_utils::upload_filename_template;
LT_CHECK_EQ(file->second.get_file_system_file_name().substr(0, file->second.get_file_system_file_name().size() - 6),
expected_filename.substr(0, expected_filename.size() - 6));
LT_CHECK_EQ(file_exists(file->second.get_file_system_file_name()), false);

file_key++;
LT_CHECK_EQ(file_key->first, TEST_KEY_2);
Expand All @@ -367,6 +376,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_memory_and_disk_two_files)
httpserver::http::http_utils::upload_filename_template;
LT_CHECK_EQ(file->second.get_file_system_file_name().substr(0, file->second.get_file_system_file_name().size() - 6),
expected_filename.substr(0, expected_filename.size() - 6));
LT_CHECK_EQ(file_exists(file->second.get_file_system_file_name()), false);


ws->stop();
Expand Down Expand Up @@ -412,6 +422,7 @@ LT_BEGIN_AUTO_TEST(file_upload_suite, file_upload_disk_only)
httpserver::http::http_utils::upload_filename_template;
LT_CHECK_EQ(file->second.get_file_system_file_name().substr(0, file->second.get_file_system_file_name().size() - 6),
expected_filename.substr(0, expected_filename.size() - 6));
LT_CHECK_EQ(file_exists(file->second.get_file_system_file_name()), false);

ws->stop();
delete ws;
Expand Down