adjust mock path to certs which is fix for abrupt mock process finish… (#202)

* adjust mock path to certs which is fix for abrupt mock process finish. Added integration test for mock startup and exposed exception which was silenced

* change port of mock in integration test

Author: dkijania

Cargo.lock

@@ -71,8 +71,15 @@ tokio-stream = { version = "0.1.8", features = ["net"] }
 [dev-dependencies]
 quickcheck = "0.9"
 quickcheck_macros = "0.9"
+assert_fs ="1.0"
+assert_cmd = "1.0"
 
 [dependencies.reqwest]
 version = "0.10.10"
 default-features = false
 features = ["blocking", "rustls-tls", "json"]
+
+[dev-dependencies.reqwest]
+version = "0.10.10"
+default-features = false
+features = ["blocking", "rustls-tls","native-tls", "json"]

vitup/Cargo.toml

@@ -1,5 +1,5 @@
 {
-  "port": 80,
+  "port": 8080,
   "working_dir": "./mock",
   "ideascale": false
 }

vitup/example/mock/config.yaml

@@ -3,7 +3,7 @@
   "working_dir": "./mock",
   "ideascale": false,
   "protocol": {
-    "key_path": "../resources/tls/server.key",
-    "cert_path": "../resources/tls/server.crt"
+    "key_path": "./resources/tls/server.key",
+    "cert_path": "./resources/tls/server.crt"
   }
 }

vitup/example/mock/https.yaml

@@ -31,7 +31,7 @@ impl MockStartCommandArgs {
 
         let control_context = Arc::new(Mutex::new(Context::new(configuration, start_params)?));
 
-        tokio::spawn(async move { start_rest_server(control_context.clone()).await })
+        tokio::spawn(async move { start_rest_server(control_context.clone()).await.unwrap() })
             .await
             .map(|_| ())
             .map_err(Into::into)

vitup/src/cli/start/mock.rs

@@ -89,28 +89,28 @@ impl Config {
         );
 
         println!(
-            "refresh timestamp:\t(registration_snapshot_time):\t\t\t{:?}",
+            "refresh timestamp:\t(registration_snapshot_time):\t\t\t{}",
             self.data.snapshot_time
         );
 
         println!(
-            "vote start timestamp:\t(fund_start_time, chain_vote_start_time):\t{:?}",
+            "vote start timestamp:\t(fund_start_time, chain_vote_start_time):\t{}",
             vote_start_timestamp
         );
         println!(
-            "tally start timestamp:\t(fund_end_time, chain_vote_end_time):\t\t{:?}",
+            "tally start timestamp:\t(fund_end_time, chain_vote_end_time):\t\t{}",
             tally_start_timestamp
         );
         println!(
-            "tally end timestamp:\t(chain_committee_end_time):\t\t\t{:?}",
+            "tally end timestamp:\t(chain_committee_end_time):\t\t\t{}",
             tally_end_timestamp
         );
         println!(
-            "next refresh timestamp:\t(next registration_snapshot_time):\t\t{:?}",
+            "next refresh timestamp:\t(next registration_snapshot_time):\t\t{}",
             self.data.next_snapshot_time
         );
         println!(
-            "next vote start time:\t(next_fund_start_time):\t\t\t\t{:?}",
+            "next vote start time:\t(next_fund_start_time):\t\t\t\t{}",
             self.data.next_vote_start_time
         );
     }

vitup/src/config/mod.rs

@@ -0,0 +1 @@
+mod startup;

vitup/tests/mock/mod.rs

@@ -0,0 +1,49 @@
+use assert_cmd::cargo::CommandCargoExt;
+use assert_fs::fixture::PathChild;
+use assert_fs::TempDir;
+use std::io::Write;
+use std::path::Path;
+use std::process::Command;
+use vitup::mode::mock::Configuration;
+
+pub fn write_config<P: AsRef<Path>>(config: &Configuration, output: P) {
+    let content = serde_json::to_string(&config).unwrap();
+    let mut file = std::fs::File::create(&output).unwrap();
+    file.write_all(content.as_bytes()).unwrap()
+}
+
+#[test]
+pub fn start_mock() {
+    let temp_dir = TempDir::new().unwrap();
+
+    let configuration = Configuration {
+        port: 10000,
+        working_dir: temp_dir.child("mock").path().to_path_buf(),
+        ideascale: false,
+        protocol: Default::default(),
+        token: None,
+    };
+
+    let config_child = temp_dir.child("config.yaml");
+    let config_file_path = config_child.path();
+    write_config(&configuration, &config_file_path);
+
+    let mut cmd = Command::cargo_bin("vitup").unwrap();
+    let mut mock_process = cmd
+        .arg("start")
+        .arg("mock")
+        .arg("--config")
+        .arg(&config_file_path)
+        .spawn()
+        .unwrap();
+
+    let request = reqwest::blocking::Client::new()
+        .get(&format!(
+            "http://localhost:{}/api/health",
+            configuration.port
+        ))
+        .send();
+
+    mock_process.kill().unwrap();
+    assert_eq!(request.unwrap().status(), 200);
+}

vitup/tests/mock/startup.rs

@@ -1 +1,2 @@
 mod data;
+mod mock;