Add version to slurm output, fix test

src/output.rs

@@ -244,10 +244,10 @@ pub fn test_json() {
     a.push_o(o);
     a.push_e();
     a.push_s(r#"stri\ng"#.to_string());
-    let expect =
-        concat!(r#"[{"o":{},"a":[],"s":"hello, \"sir\"","u":123,"i":-12,"f":12.5},,"stri\\ng"]"#,
-                "\n",
-        );
+    let expect = concat!(
+        r#"[{"o":{},"a":[],"s":"hello, \"sir\"","u":123,"i":-12,"f":12.5},,"stri\\ng"]"#,
+        "\n",
+    );
     let mut output = Vec::new();
     write_json(&mut output, &Value::A(a));
     let got = String::from_utf8_lossy(&output);
@@ -355,7 +355,10 @@ pub fn test_csv() {
         ab.push_u(x);
     }
     o.push_a("x", ab);
-    let expect = concat!(r#"o=,a=1||2,"s=hello, ""sir""",u=123,i=-12,f=12.5,x=)(t*1b"#, "\n");
+    let expect = concat!(
+        r#"o=,a=1||2,"s=hello, ""sir""",u=123,i=-12,f=12.5,x=)(t*1b"#,
+        "\n"
+    );
     let mut output = Vec::new();
     write_csv(&mut output, &Value::O(o));
     let got = String::from_utf8_lossy(&output);

src/slurmjobs.rs

@@ -173,7 +173,9 @@ fn format_jobs(
         let fields = &field_store[..field_names.len()];
 
         let mut output_line = output::Object::new();
-        output_line.push_s("v", VERSION.to_string());
+        if !json {
+            output_line.push_s("v", VERSION.to_string());
+        }
         for (i, name) in field_names.iter().enumerate() {
             let mut val = fields[i].to_string();
             let is_zero = val.is_empty()
@@ -203,6 +205,7 @@ fn format_jobs(
     }
     if json {
         let mut envelope = output::Object::new();
+        envelope.push_s("v", VERSION.to_string());
         envelope.push_a("jobs", jobs);
         output::write_json(writer, &output::Value::O(envelope));
     }

tests/slurm-syntax.sh

@@ -12,7 +12,7 @@ fi
 
 # Check that sacct is available, or we should do nothing
 
-if [[ !$(command -v sacct) ]]; then
+if [[ $(command -v sacct) == "" ]]; then
     echo "No sacct"
     exit 0
 fi