summaryrefslogtreecommitdiff
path: root/src/ostree/ot-builtin-trivial-httpd.c
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2016-07-07 17:39:07 -0400
committerAtomic Bot <atomic-devel@projectatomic.io>2016-07-08 18:38:11 +0000
commitd7629d33a4bdd17816a25f13a09865cfb6248d1f (patch)
tree8583bb761891f2b4e568e3d514ad2b1c0cc25b31 /src/ostree/ot-builtin-trivial-httpd.c
parent71301d18244a3a26a6ba6fd3934633ef94811a15 (diff)
downloadostree-d7629d33a4bdd17816a25f13a09865cfb6248d1f.tar.gz
tests: Add some test coverage of repeated pulls w/HTTP 500s
Systems like pulp may want to keep retrying in a loop if the server throws a (hopefully transient) 500, and we need test coverage of handling these errors versus our existing 404 and 206 coverage. Closes: #383 Approved by: mbarnes
Diffstat (limited to 'src/ostree/ot-builtin-trivial-httpd.c')
-rw-r--r--src/ostree/ot-builtin-trivial-httpd.c24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/ostree/ot-builtin-trivial-httpd.c b/src/ostree/ot-builtin-trivial-httpd.c
index 811e8924..5b942cd5 100644
--- a/src/ostree/ot-builtin-trivial-httpd.c
+++ b/src/ostree/ot-builtin-trivial-httpd.c
@@ -38,8 +38,14 @@ static char *opt_log = NULL;
static gboolean opt_daemonize;
static gboolean opt_autoexit;
static gboolean opt_force_ranges;
+static int opt_random_500s_percentage;
+/* We have a strong upper bound for any unlikely
+ * cases involving repeated random 500s. */
+static int opt_random_500s_max = 100;
static gint opt_port = 0;
+static guint emitted_random_500s_count = 0;
+
typedef struct {
GFile *root;
gboolean running;
@@ -52,6 +58,8 @@ static GOptionEntry options[] = {
{ "port", 'P', 0, G_OPTION_ARG_INT, &opt_port, "Use the specified TCP port", NULL },
{ "port-file", 'p', 0, G_OPTION_ARG_FILENAME, &opt_port_file, "Write port number to PATH (- for standard output)", "PATH" },
{ "force-range-requests", 0, 0, G_OPTION_ARG_NONE, &opt_force_ranges, "Force range requests by only serving half of files", NULL },
+ { "random-500s", 0, 0, G_OPTION_ARG_INT, &opt_random_500s_percentage, "Generate random HTTP 500 errors approximately for PERCENTAGE requests", "PERCENTAGE" },
+ { "random-500s-max", 0, 0, G_OPTION_ARG_INT, &opt_random_500s_max, "Limit HTTP 500 errors to MAX (default 100)", "MAX" },
{ "log-file", 0, 0, G_OPTION_ARG_FILENAME, &opt_log, "Put logs here", "PATH" },
{ NULL }
};
@@ -187,6 +195,15 @@ do_get (OtTrivialHttpd *self,
goto out;
}
+ if (opt_random_500s_percentage > 0 &&
+ emitted_random_500s_count < opt_random_500s_max &&
+ g_random_int_range (0, 100) < opt_random_500s_percentage)
+ {
+ emitted_random_500s_count++;
+ soup_message_set_status (msg, SOUP_STATUS_INTERNAL_SERVER_ERROR);
+ goto out;
+ }
+
if (path[0] == '/')
path++;
@@ -388,6 +405,13 @@ ostree_builtin_trivial_httpd (int argc, char **argv, GCancellable *cancellable,
app->root = g_file_new_for_path (dirpath);
+ if (!(opt_random_500s_percentage >= 0 && opt_random_500s_percentage <= 99))
+ {
+ g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ "Invalid --random-500s=%u", opt_random_500s_percentage);
+ goto out;
+ }
+
if (opt_log)
{
GOutputStream *stream = NULL;