additional toml->yaml items

crates/holochain/src/bin/holochain/main.rs

@@ -30,7 +30,7 @@ struct Opt {
     #[structopt(
         short = "c",
         long,
-        help = "Path to a TOML file containing conductor configuration"
+        help = "Path to a YAML file containing conductor configuration"
     )]
     config_path: Option<PathBuf>,
 
@@ -177,7 +177,7 @@ Error: The conductor is set up to load its configuration from the default path:
     {path}
 
 but this file doesn't exist. If you meant to specify a path, run this command
-again with the -c option. Otherwise, please either create a TOML config file at
+again with the -c option. Otherwise, please either create a YAML config file at
 this path yourself, or rerun the command with the '-i' flag, which will help you
 automatically create a default config file.
         ",
@@ -190,7 +190,7 @@ Error: You asked to load configuration from the path:
 
     {path}
 
-but this file doesn't exist. Please either create a TOML config file at this
+but this file doesn't exist. Please either create a YAML config file at this
 path yourself, or rerun the command with the '-i' flag, which will help you
 automatically create a default config file.
         ",

crates/holochain/src/conductor/interactive.rs

@@ -66,7 +66,7 @@ pub fn load_config_or_prompt_for_default(
     ConductorConfig::load_yaml(config_path.as_ref()).map(Some).or_else(|err| {
         if let ConductorError::ConfigMissing(_) = err {
             let prompt = format!(
-                "There is no conductor config TOML file at the path specified ({})\nWould you like to create a default config file at this location?",
+                "There is no conductor config YAML file at the path specified ({})\nWould you like to create a default config file at this location?",
                 config_path
             );
             if ask_yn(prompt, Some(true))? {

crates/holochain/src/conductor/paths.rs

@@ -8,7 +8,7 @@ const ORGANIZATION: &str = "holochain";
 const APPLICATION: &str = "holochain";
 const KEYS_DIRECTORY: &str = "keys";
 const DATABASES_DIRECTORY: &str = "databases";
-const CONFIG_FILENAME: &str = "conductor-config.toml";
+const CONFIG_FILENAME: &str = "conductor-config.yml";
 
 /// Returns the project root builder for holochain directories.
 fn project_root() -> Option<directories::ProjectDirs> {

crates/holochain/tests/test_cli.rs

@@ -6,10 +6,9 @@ use std::process::Command;
 use tempdir::TempDir;
 
 #[test]
-// (david.b) [D-01034] these take minutes to run in nix/CI - disable until fixed
 fn first_experience_with_holochain_is_a_friendly_one() {
     let tmp = TempDir::new("").unwrap();
-    let path = tmp.path().join("missing-config.toml");
+    let path = tmp.path().join("missing-config.yml");
     let mut cmd = Command::cargo_bin("holochain").unwrap();
     let cmd = cmd.args(&["-c", &path.display().to_string()]);
     cmd.assert().failure().code(predicate::eq(42));
@@ -19,11 +18,10 @@ fn first_experience_with_holochain_is_a_friendly_one() {
 }
 
 #[test]
-// (david.b) [D-01034] these take minutes to run in nix/CI - disable until fixed
 fn malformed_toml_error_is_friendly() {
     let tmp = TempDir::new("").unwrap();
-    let path = tmp.path().join("malformed-config.toml");
-    std::fs::write(&path, "{{ totally [ not ( valid toml").unwrap();
+    let path = tmp.path().join("malformed-config.yml");
+    std::fs::write(&path, "{{ totally [ not ( valid yaml").unwrap();
     let mut cmd = Command::cargo_bin("holochain").unwrap();
     let cmd = cmd.args(&["-c", &path.display().to_string()]);
     cmd.assert().failure().code(predicate::eq(42));
@@ -32,15 +30,14 @@ fn malformed_toml_error_is_friendly() {
         .stdout(predicate::str::is_match("[Pp]lease").unwrap());
     cmd.assert()
         .append_context("reason", "output contains the wrong reason for error")
-        .stdout(predicate::str::contains("expected a table key"));
+        .stdout(predicate::str::contains("did not find expected"));
 }
 
 #[test]
-// (david.b) [D-01034] these take minutes to run in nix/CI - disable until fixed
 fn invalid_config_error_is_friendly() {
     let tmp = TempDir::new("").unwrap();
-    let path = tmp.path().join("malformed-config.toml");
-    std::fs::write(&path, "[valid]\nbut=\"wrong\"").unwrap();
+    let path = tmp.path().join("malformed-config.yml");
+    std::fs::write(&path, "valid:\n  but: wrong").unwrap();
     let mut cmd = Command::cargo_bin("holochain").unwrap();
     let cmd = cmd.args(&["-c", &path.display().to_string()]);
     cmd.assert().failure().code(predicate::eq(42));