Auto merge of #11356 - arlosi:sparse-publish, r=epage

Fix wait-for-publish with sparse registry

The `wait-for-publish` feature doesn't work when publishing a new version of an existing crate on a sparse registry.

The `invalidate_cache` method doesn't clear the `fresh` list, so repeated requests just use the in-memory data if it's available. This didn't show up in the tests, because the test only simulated the `not found` to `crate available` transition, rather than the `old file` to `crate available` transition.

This change modifies the test by capturing the publish request, then deferring it until after later request for the index file.

r? `@epage`

Fixes #11314

crates/cargo-test-support/src/registry.rs

@@ -469,6 +469,7 @@ impl Drop for HttpServerHandle {
 }
 
 /// Request to the test http server
+#[derive(Clone)]
 pub struct Request {
  pub url: Url,
  pub method: String,

src/cargo/sources/registry/http_remote.rs

@@ -549,6 +549,7 @@ impl<'cfg> RegistryData for HttpRegistry<'cfg> {
  // All it does is ensure that a subsequent load will double-check files with the
  // server rather than rely on a locally cached copy of the index files.
  debug!("invalidated index cache");
+ self.fresh.clear();
  self.requested_update = true;
  }
 

tests/testsuite/publish.rs

@@ -2570,20 +2570,25 @@ fn wait_for_subsequent_publish() {
  // Counter for number of tries before the package is "published"
  let arc: Arc<Mutex<u32>> = Arc::new(Mutex::new(0));
  let arc2 = arc.clone();
+ let publish_req = Arc::new(Mutex::new(None));
+ let publish_req2 = publish_req.clone();
 
- // Registry returns an invalid response.
  let registry = registry::RegistryBuilder::new()
  .http_index()
  .http_api()
+ .add_responder("/api/v1/crates/new", move |req, server| {
+ // Capture the publish request, but defer publishing
+ *publish_req.lock().unwrap() = Some(req.clone());
+ server.ok(req)
+ })
  .add_responder("/index/de/la/delay", move |req, server| {
  let mut lock = arc.lock().unwrap();
  *lock += 1;
- // if the package name contains _ or -
- if *lock <= 2 {
- server.not_found(req)
- } else {
- server.index(req)
+ if *lock == 3 {
+ // Run the publish on the 3rd attempt
+ server.publish(&publish_req2.lock().unwrap().as_ref().unwrap());
  }
+ server.index(req)
  })
  .build();