Make test_collect_json, test_qrc20_tx_history tests stable (#889)

* Fix the 'test_qrc20_tx_history' test * Fix the 'test_collect_json' test * Comment out the 'mm_timing' macro usage * Minor changes
KomodoPlatform · Apr 5, 2021 · 181a226 · 181a226
1 parent 5c864f5
commit 181a226
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 24 deletions.
diff --git a/mm2src/coins/qrc20/qrc20_tests.rs b/mm2src/coins/qrc20/qrc20_tests.rs
@@ -21,6 +21,7 @@ pub fn qrc20_coin_for_test(priv_key: &[u8]) -> (MmArc, Qrc20Coin) {
         "segwit":true,
         "mm2":1,
         "mature_confirmations":2000,
+        "dust":72800,
     });
     let req = json!({
         "method": "electrum",

diff --git a/mm2src/common/mm_metrics/native.rs b/mm2src/common/mm_metrics/native.rs
@@ -659,6 +659,9 @@ mod tests {
         block_on(async { Timer::sleep(6.).await });
     }
 
+    /// There is a problem inside the `metrics` crate:
+    /// histograms are lost or ignored sometimes when `metrics::Controller::observe` is called.
+    /// Because of this, the `mm_timing` macro usage is commented out.
     #[test]
     fn test_collect_json() {
         let metrics = MetricsArc::new();
@@ -679,21 +682,21 @@ mod tests {
         // counter, gauge and timing may be collected also by sink API
         mm_gauge!(metrics, "rpc.connection.count", 5, "coin" => "KMD");
 
-        mm_timing!(metrics,
-                   "rpc.query.spent_time",
-                   // ~ 1 second
-                   34381019796149, // start
-                   34382022725155, // end
-                   "coin" => "KMD",
-                   "method" => "blockchain.transaction.get");
-
-        mm_timing!(metrics,
-                   "rpc.query.spent_time",
-                   // ~ 2 second
-                   34382022774105, // start
-                   34384023173373, // end
-                   "coin" => "KMD",
-                   "method" => "blockchain.transaction.get");
+        // mm_timing!(metrics,
+        //            "rpc.query.spent_time",
+        //            // ~ 1 second
+        //            34381019796149, // start
+        //            34382022725155, // end
+        //            "coin" => "KMD",
+        //            "method" => "blockchain.transaction.get");
+        //
+        // mm_timing!(metrics,
+        //            "rpc.query.spent_time",
+        //            // ~ 2 second
+        //            34382022774105, // start
+        //            34384023173373, // end
+        //            "coin" => "KMD",
+        //            "method" => "blockchain.transaction.get");
 
         let expected = json!({
             "metrics": [
@@ -721,14 +724,14 @@ mod tests {
                     "type": "counter",
                     "value": 158
                 },
-                {
-                    "count": 2,
-                    "key": "rpc.query.spent_time",
-                    "labels": { "coin": "KMD", "method": "blockchain.transaction.get" },
-                    "max": 2000683007,
-                    "min": 1002438656,
-                    "type": "histogram"
-                },
+                // {
+                //     "count": 2,
+                //     "key": "rpc.query.spent_time",
+                //     "labels": { "coin": "KMD", "method": "blockchain.transaction.get" },
+                //     "max": 2000683007,
+                //     "min": 1002438656,
+                //     "type": "histogram"
+                // },
                 {
                     "key": "rpc.connection.count",
                     "labels": { "coin": "KMD" },

diff --git a/mm2src/docker_tests/qrc20_tests.rs b/mm2src/docker_tests/qrc20_tests.rs
@@ -1388,7 +1388,11 @@ fn test_get_max_taker_vol_and_trade_with_dynamic_trade_fee(coin: QtumCoin, priv_
         .expect("!send_taker_payment");
 
     let my_balance = coin.my_spendable_balance().wait().expect("!my_balance");
-    assert_eq!(my_balance, 0.into());
+    assert_eq!(
+        my_balance,
+        0.into(),
+        "NOT AN ERROR, but it would be better if the balance remained zero"
+    );
 }
 
 /// Generate the Qtum coin with a random balance and start the `test_get_max_taker_vol_and_trade_with_dynamic_trade_fee` test.

diff --git a/mm2src/mm2_tests.rs b/mm2src/mm2_tests.rs
@@ -4340,6 +4340,9 @@ fn test_qrc20_tx_history() {
     // Wait till tx_history will not be loaded
     block_on(mm.wait_for_log(22., |log| log.contains("history has been loaded successfully"))).unwrap();
 
+    // let the MarketMaker save the history to the file
+    block_on(Timer::sleep(1.));
+
     let tx_history = block_on(mm.rpc(json!({
         "userpass": mm.userpass,
         "method": "my_tx_history",