You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
43 lines
1.3 KiB
43 lines
1.3 KiB
1 year ago
|
From 85241affaa52e4d67d0a22329d4cc5e2b0fe5ca3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
||
|
|
Date: Fri, 28 Jul 2023 16:59:20 +0100
|
||
|
|
Subject: [PATCH] tests/test-retry-request-mirror.c: Don't assume state after
|
||
|
|
connect
|
||
|
|
|
||
|
|
After forthcoming changes to the curl plugin we cannot assume the
|
||
|
|
exact mirror we will be connected to after making the NBD connection.
|
||
|
|
So remove that assumption.
|
||
|
|
|
||
|
|
See: commit 38dccd848bd40cccdf012df7a606e13282aaeecb
|
||
|
|
Reviewed-by: Eric Blake <eblake@redhat.com>
|
||
|
|
(cherry picked from commit ee03fbd2385dcd8772ad2c838401df0b5d8c5617)
|
||
|
|
---
|
||
|
|
tests/test-retry-request-mirror.c | 4 +++-
|
||
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/tests/test-retry-request-mirror.c b/tests/test-retry-request-mirror.c
|
||
|
|
index cf42c596..65440d2e 100644
|
||
|
|
--- a/tests/test-retry-request-mirror.c
|
||
|
|
+++ b/tests/test-retry-request-mirror.c
|
||
|
|
@@ -58,7 +58,7 @@ main (int argc, char *argv[])
|
||
|
|
const char *sockpath;
|
||
|
|
CLEANUP_FREE char *usp_param = NULL;
|
||
|
|
int i, j;
|
||
|
|
- char state = 0;
|
||
|
|
+ char state;
|
||
|
|
struct nbd_handle *nbd = NULL;
|
||
|
|
|
||
|
|
#ifndef HAVE_CURLOPT_UNIX_SOCKET_PATH
|
||
|
|
@@ -105,6 +105,8 @@ main (int argc, char *argv[])
|
||
|
|
if (nbd_connect_unix (nbd, sock /* NBD socket */) == -1)
|
||
|
|
goto nbd_error;
|
||
|
|
|
||
|
|
+ state = 0;
|
||
|
|
+
|
||
|
|
for (i = 0; i < 7 /* not divisible by 2 or 3 */; ++i) {
|
||
|
|
char buf[512];
|
||
|
|
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|