From 7cbfb9d62b3f7c3da99d6c029730a756044fd06c Mon Sep 17 00:00:00 2001
From: Sushain Cherivirala <sushain@skc.name>
Date: Sat, 13 Mar 2021 11:25:22 -0800
Subject: [PATCH] Mostly fix coverage workflow & other minor tweaks (#82)

* Bump timeout for coverage runs

* Switch submodule to apertium org

* Bump reset duration to 10m in future

* Tweak some names

* Add --debug

* Try downgrading

* Exclude rlx

* Why did I ever enable this???
---
 .github/workflows/check.yml | 2 +-
 .gitmodules                 | 2 +-
 .rustfmt.toml               | 2 --
 src/stats/lexd.rs           | 8 ++++----
 src/tests/common.rs         | 2 +-
 src/tests/get.rs            | 5 +++++
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index c5458e9..37a8515 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -92,7 +92,7 @@ jobs:
         uses: actions-rs/tarpaulin@v0.1
         with:
           version: "0.16.0"
-          args: --out Lcov
+          args: --out Lcov --timeout 120 --exclude-files src/stats/tree-sitter-apertium/*
       - name: Upload coverage
         uses: coverallsapp/github-action@master
         with:
diff --git a/.gitmodules b/.gitmodules
index e440dab..c76f08e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "src/stats/tree-sitter-apertium"]
 	path = src/stats/tree-sitter-apertium
-	url = git@github.com:mr-martian/tree-sitter-apertium.git
+	url = https://github.com/apertium/tree-sitter-apertium.git
diff --git a/.rustfmt.toml b/.rustfmt.toml
index 97487eb..8ac293e 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -1,8 +1,6 @@
 condense_wildcard_suffixes = true
 match_block_trailing_comma = true
 imports_granularity = "Crate"
-report_fixme = "Unnumbered"
-report_todo = "Unnumbered"
 unstable_features = true
 use_field_init_shorthand = true
 use_try_shorthand = true
diff --git a/src/stats/lexd.rs b/src/stats/lexd.rs
index f48102f..53dd2c7 100644
--- a/src/stats/lexd.rs
+++ b/src/stats/lexd.rs
@@ -27,12 +27,12 @@ pub fn get_stats(_logger: &Logger, body: &str) -> Result<Vec<(StatKind, JsonValu
     let mut walker: TreeCursor = tree.root_node().walk();
 
     for child in tree.root_node().children(&mut walker) {
-        let mut walker2: TreeCursor = child.walk();
+        let mut child_walker: TreeCursor = child.walk();
         if child.kind() == "pattern_block" {
-            if child.child(0).unwrap().kind() == "pattern_start" {
+            if child.child(0).map(|node| node.kind()) == Some("pattern_start") {
                 patterns.insert("");
             }
-            for line in child.children(&mut walker2) {
+            for line in child.children(&mut child_walker) {
                 if line.kind() == "pattern_line" {
                     pat_entries += 1;
                 } else if line.kind() == "identifier" {
@@ -40,7 +40,7 @@ pub fn get_stats(_logger: &Logger, body: &str) -> Result<Vec<(StatKind, JsonValu
                 }
             }
         } else if child.kind() == "lexicon_block" {
-            for line in child.children(&mut walker2) {
+            for line in child.children(&mut child_walker) {
                 if line.kind() == "lexicon_line" {
                     lex_entries += 1;
                 } else if line.kind() == "identifier" {
diff --git a/src/tests/common.rs b/src/tests/common.rs
index b01d365..66438d8 100644
--- a/src/tests/common.rs
+++ b/src/tests/common.rs
@@ -46,7 +46,7 @@ macro_rules! run_test_with_github_auth {
 
         let server = MockServer::start();
         for (i, mut listing) in PACKAGE_LISTING.clone().into_iter().enumerate() {
-            let reset = (Utc::now() + Duration::minutes(2)).format("%FT%TZ").to_string();
+            let reset = (Utc::now() + Duration::minutes(30)).format("%FT%TZ").to_string();
             listing["data"]["rateLimit"]["resetAt"] = json!(&reset).into();
 
             let after = if i == 0 {
diff --git a/src/tests/get.rs b/src/tests/get.rs
index f51b91c..14245df 100644
--- a/src/tests/get.rs
+++ b/src/tests/get.rs
@@ -254,8 +254,13 @@ fn lexd_module_stats() {
 
 #[test]
 fn module_specific_stats() {
+    #[cfg(not(tarpaulin))]
     let kinds = [("monodix", 2), ("rlx", 1), ("postdix", 1)];
 
+    // TODO: Bring back `rlx` once tarpaulin doesn't sometimes hang on `cg-comp`.
+    #[cfg(tarpaulin)]
+    let kinds = [("monodix", 2), ("postdix", 1)];
+
     for (kind, stat_count) in &kinds {
         let module = format!("apertium-{}", TEST_LT_MODULE);
         let endpoint = format!("/{}/{}?async=false", module, kind);