Merge pull request #1 from sensmetry/ci/fix-failing-tests

ci: fix failing tests.

Author: vytautas-astrauskas-sensmetry

sysand/src/cli.rs

@@ -67,15 +67,23 @@ pub enum Command {
         /// Do not try to normalise the IRI/URI when resolving
         #[arg(long, default_value = "false", visible_alias = "no-normalize")]
         no_normalise: bool,
+        /// Use an index when resolving this usage
         #[arg(long, default_value = Some(DEFAULT_INDEX_URL))]
         use_index: Option<String>,
+        /// Do not use any index when resolving this usage
+        #[arg(long, default_value = "false", conflicts_with = "use_index")]
+        no_index: bool,
         // TODO: Add various options, such as whether to take local environment
         //       into consideration
     },
     /// Update lockfile
     Lock {
+        /// Use an index when updating the lockfile
         #[arg(long, default_value = Some(DEFAULT_INDEX_URL))]
         use_index: Option<String>,
+        /// Do not use any index when updating the lockfile
+        #[arg(long, default_value = "false", conflicts_with = "use_index")]
+        no_index: bool,
     },
     /// Add usage to project information
     Add {
@@ -92,6 +100,9 @@ pub enum Command {
         /// Use an index when resolving this usage
         #[arg(long, default_value = Some(DEFAULT_INDEX_URL))]
         use_index: Option<String>,
+        /// Do not use any index when resolving this usage
+        #[arg(long, default_value = "false", conflicts_with = "use_index")]
+        no_index: bool,
     },
     /// Remove usage from project information
     Remove {

sysand/src/lib.rs

@@ -122,7 +122,13 @@ pub fn run_cli(args: cli::Args) -> Result<()> {
                 no_deps,
             }) => command_sources_env(iri, version, !no_deps, current_environment),
         },
-        cli::Command::Lock { use_index } => {
+        cli::Command::Lock {
+            mut use_index,
+            no_index,
+        } => {
+            if no_index {
+                use_index = None;
+            }
             if let Some(path) = project_root {
                 crate::commands::lock::command_lock(path, client, use_index)
             } else {
@@ -153,8 +159,12 @@ pub fn run_cli(args: cli::Args) -> Result<()> {
             auto,
             location,
             no_normalise,
-            use_index,
+            mut use_index,
+            no_index,
         } => {
+            if no_index {
+                use_index = None;
+            }
             match location {
                 Some(actual_location) => {
                     if iri {
@@ -195,8 +205,12 @@ pub fn run_cli(args: cli::Args) -> Result<()> {
             versions_constraint,
             no_lock,
             no_sync,
-            use_index,
+            mut use_index,
+            no_index,
         } => {
+            if no_index {
+                use_index = None;
+            }
             command_add(iri, versions_constraint, current_project)?;
 
             if !no_lock {

sysand/tests/cli_source.rs

@@ -47,7 +47,13 @@ fn list_sources() -> Result<(), Box<dyn std::error::Error>> {
 
     let out = run_sysand_in(
         &path,
-        &vec!["add", "--no-sync", "urn:kpar:list_sources_dep"],
+        &vec![
+            "add",
+            "--no-sync",
+            "urn:kpar:list_sources_dep",
+            "--no-index",
+            "--verbose",
+        ],
         None,
     )?;
     out.assert().success();