Fix NordicHPC#233 - add an error channel + test cases

src/gpu.rs

@@ -76,14 +76,45 @@ pub trait GPU {
     fn get_card_utilization(&mut self) -> Result<Vec<CardState>, String>;
 }
 
+pub trait GpuAPI {
+    fn probe(&self) -> Option<Box<dyn GPU>>;
+}
+
 // Probe the system for GPUs.
 
-pub fn probe() -> Option<Box<dyn GPU>> {
-    if let Some(nvidia) = nvidia::probe() {
-        Some(nvidia)
-    } else if let Some(amd) = amd::probe() {
-        Some(amd)
-    } else {
+pub struct RealGpuAPI {}
+
+impl RealGpuAPI {
+    pub fn new() -> RealGpuAPI {
+        RealGpuAPI {}
+    }
+}
+
+impl GpuAPI for RealGpuAPI {
+    fn probe(&self) -> Option<Box<dyn GPU>> {
+        if let Some(nvidia) = nvidia::probe() {
+            Some(nvidia)
+        } else if let Some(amd) = amd::probe() {
+            Some(amd)
+        } else {
+            None
+        }
+    }
+}
+
+#[cfg(test)]
+pub struct MockGpuAPI {}
+
+#[cfg(test)]
+impl MockGpuAPI {
+    pub fn new() -> MockGpuAPI {
+        MockGpuAPI {}
+    }
+}
+
+#[cfg(test)]
+impl GpuAPI for MockGpuAPI {
+    fn probe(&self) -> Option<Box<dyn GPU>> {
         None
     }
 }

src/main.rs

@@ -147,7 +147,7 @@ fn main() {
             sysinfo::show_system(writer, &timestamp, *csv);
         }
         Commands::Slurmjobs { window, span, json } => {
-            slurmjobs::show_slurm_jobs(writer, window, span, *json);
+            slurmjobs::show_slurm_jobs(writer, window, span, &timestamp, *json);
         }
         Commands::Version {} => {
             show_version(writer);

src/output.rs

@@ -8,6 +8,7 @@ use crate::util;
 
 use std::io;
 
+#[derive(Debug)]
 pub enum Value {
     A(Array),
     O(Object),
@@ -18,11 +19,13 @@ pub enum Value {
     E(), // Empty array element only, never a field or toplevel value
 }
 
+#[derive(Debug)]
 struct Field {
     tag: String,
     value: Value,
 }
 
+#[derive(Debug)]
 pub struct Object {
     fields: Vec<Field>,
 }
@@ -37,6 +40,16 @@ impl Object {
         self.fields.is_empty()
     }
 
+    #[cfg(test)]
+    pub fn get(&self, key: &str) -> Option<&Value> {
+        for f in &self.fields {
+            if key == &f.tag {
+                return Some(&f.value);
+            }
+        }
+        None
+    }
+
     pub fn push(&mut self, tag: &str, value: Value) {
         self.fields.push(Field {
             tag: tag.to_string(),
@@ -83,6 +96,7 @@ impl Object {
     }
 }
 
+#[derive(Debug)]
 pub struct Array {
     elements: Vec<Value>,
     nonempty_base45: bool,
@@ -115,6 +129,10 @@ impl Array {
         self.elements.len()
     }
 
+    pub fn at(&self, i: usize) -> &Value {
+        &self.elements[i]
+    }
+
     pub fn push_o(&mut self, o: Object) {
         self.push(Value::O(o));
     }