remove source of conflicts

gnocchixyz · Feb 13, 2025 · 9a7a623 · 9a7a623
1 parent 691e237
commit 9a7a623
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/gnocchi/tests/test_carbonara.py b/gnocchi/tests/test_carbonara.py
@@ -317,7 +317,7 @@ def test_aggregation_std_with_unique(self):
             [datetime64(2014, 1, 1, 12, 0, 0)], [3])
         ts = self._resample(ts, numpy.timedelta64(60, 's'), 'std')
 
-        self.assertEqual(0, len(ts), ts.values.size)
+        self.assertEqual(0, len(ts), ts.values)
 
         ts = carbonara.TimeSerie.from_data(
             [datetime64(2014, 1, 1, 12, 0, 0),