adjust to upstream changes

codecov · Nov 29, 2024 · 4282b18 · 4282b18
1 parent f7dbc61
commit 4282b18
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 97 deletions.
diff --git a/.github/workflows/bench.yml b/.github/workflows/bench.yml
@@ -19,6 +19,8 @@ jobs:
       - run: cargo binstall cargo-codspeed
       - uses: Swatinem/rust-cache@v2
 
+      - uses: actions/setup-python@v5
+
       - run: cargo codspeed build
       - uses: CodSpeedHQ/action@v3
         with:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -6,13 +6,12 @@ on:
       - main
   pull_request:
 
-env:
-  RUSTFLAGS: -Dwarnings
-
 jobs:
   lint:
     name: Lint
     runs-on: ubuntu-latest
+    env:
+      RUSTFLAGS: -Dwarnings
     steps:
       - uses: actions/checkout@v4
 

diff --git a/benches/binary.rs b/benches/binary.rs
@@ -176,7 +176,7 @@ fn create_random_testcases(
                     Testrun {
                         name,
                         classname: "".into(),
-                        duration: 0.,
+                        duration: Some(1.0),
                         outcome: Outcome::Pass,
                         testsuite: "".into(),
                         failure_message: None,
@@ -197,7 +197,7 @@ fn randomize_test_data(rng: &mut impl Rng, uploads: &mut [Upload]) {
 
     for upload in uploads {
         for test in &mut upload.tests {
-            test.duration = durations.sample(rng);
+            test.duration = Some(durations.sample(rng));
             test.outcome = match outcomes.sample(rng) {
                 0 => Outcome::Pass,
                 1 => Outcome::Skip,

diff --git a/src/binary/mod.rs b/src/binary/mod.rs
@@ -17,6 +17,20 @@ mod tests {
 
     use super::*;
 
+    fn test() -> Testrun {
+        Testrun {
+            name: "abc".into(),
+            classname: "".into(),
+            duration: Some(1.0),
+            outcome: Outcome::Pass,
+            testsuite: "".into(),
+            failure_message: None,
+            filename: None,
+            build_url: None,
+            computed_name: None,
+        }
+    }
+
     #[test]
     fn test_empty() {
         let writer = TestAnalyticsWriter::new(60);
@@ -30,30 +44,20 @@ mod tests {
 
     #[test]
     fn test_builder() {
-        let mut test = Testrun {
-            name: "abc".into(),
-            classname: "".into(),
-            duration: 1.0,
-            outcome: Outcome::Pass,
-            testsuite: "".into(),
-            failure_message: None,
-            filename: None,
-            build_url: None,
-            computed_name: None,
-        };
+        let mut test = test();
 
         let mut writer = TestAnalyticsWriter::new(2);
         let mut session = writer.start_session(0, &[]);
 
         session.insert(&test);
 
         test.outcome = Outcome::Failure;
-        test.duration = 2.0;
+        test.duration = Some(2.0);
         session.insert(&test);
 
         test.name = "def".into();
         test.outcome = Outcome::Skip;
-        test.duration = 0.0;
+        test.duration = Some(0.0);
         session.insert(&test);
 
         let mut buf = vec![];
@@ -79,17 +83,7 @@ mod tests {
 
     #[test]
     fn test_testsuites() {
-        let mut test = Testrun {
-            name: "abc".into(),
-            classname: "".into(),
-            duration: 1.0,
-            outcome: Outcome::Pass,
-            testsuite: "".into(),
-            failure_message: None,
-            filename: None,
-            build_url: None,
-            computed_name: None,
-        };
+        let mut test = test();
 
         let mut writer = TestAnalyticsWriter::new(2);
         let mut session = writer.start_session(0, &[]);
@@ -117,17 +111,7 @@ mod tests {
 
     #[test]
     fn test_time_shift() {
-        let test = Testrun {
-            name: "abc".into(),
-            classname: "".into(),
-            duration: 1.0,
-            outcome: Outcome::Pass,
-            testsuite: "".into(),
-            failure_message: None,
-            filename: None,
-            build_url: None,
-            computed_name: None,
-        };
+        let test = test();
 
         let mut writer = TestAnalyticsWriter::new(2);
         let mut session = writer.start_session(0, &[]);
@@ -171,17 +155,7 @@ mod tests {
 
     #[test]
     fn test_append_data() {
-        let test = Testrun {
-            name: "abc".into(),
-            classname: "".into(),
-            duration: 1.0,
-            outcome: Outcome::Pass,
-            testsuite: "".into(),
-            failure_message: None,
-            filename: None,
-            build_url: None,
-            computed_name: None,
-        };
+        let test = test();
 
         let mut writer = TestAnalyticsWriter::new(2);
         let mut session = writer.start_session(0, &[]);
@@ -223,17 +197,7 @@ mod tests {
 
     #[test]
     fn test_merge() {
-        let test = Testrun {
-            name: "abc".into(),
-            classname: "".into(),
-            duration: 1.0,
-            outcome: Outcome::Pass,
-            testsuite: "".into(),
-            failure_message: None,
-            filename: None,
-            build_url: None,
-            computed_name: None,
-        };
+        let test = test();
 
         let mut writer = TestAnalyticsWriter::new(2);
         let mut session = writer.start_session(0, &[]);
@@ -283,17 +247,7 @@ mod tests {
 
     #[test]
     fn test_garbage_collection() {
-        let test = Testrun {
-            name: "abc".into(),
-            classname: "".into(),
-            duration: 1.0,
-            outcome: Outcome::Pass,
-            testsuite: "".into(),
-            failure_message: None,
-            filename: None,
-            build_url: None,
-            computed_name: None,
-        };
+        let test = test();
 
         let mut writer = TestAnalyticsWriter::new(2);
         let mut session = writer.start_session(0, &[]);
@@ -344,17 +298,7 @@ mod tests {
 
     #[test]
     fn test_flags() {
-        let test = Testrun {
-            name: "abc".into(),
-            classname: "".into(),
-            duration: 1.0,
-            outcome: Outcome::Pass,
-            testsuite: "".into(),
-            failure_message: None,
-            filename: None,
-            build_url: None,
-            computed_name: None,
-        };
+        let test = test();
 
         let mut writer = TestAnalyticsWriter::new(2);
 
@@ -394,17 +338,7 @@ mod tests {
 
     #[test]
     fn test_historic_data() {
-        let test = Testrun {
-            name: "abc".into(),
-            classname: "".into(),
-            duration: 1.0,
-            outcome: Outcome::Pass,
-            testsuite: "".into(),
-            failure_message: None,
-            filename: None,
-            build_url: None,
-            computed_name: None,
-        };
+        let test = test();
 
         let mut writer = TestAnalyticsWriter::new(7);
 

diff --git a/src/binary/writer.rs b/src/binary/writer.rs
@@ -72,11 +72,11 @@ impl InsertSession<'_> {
         }
 
         let testdata = &mut self.writer.testdata[data_idx];
-        testdata.total_duration += test.duration as f32;
+        testdata.total_duration += test.duration.unwrap_or_default() as f32;
 
         if testdata.last_timestamp <= self.writer.timestamp {
             testdata.last_timestamp = self.writer.timestamp;
-            testdata.last_duration = test.duration as f32;
+            testdata.last_duration = test.duration.unwrap_or_default() as f32;
         }
 
         match test.outcome {