Merge branch 'master' of github.com:optimdata/chrony

optimdata · Feb 26, 2016 · 3e4dfd2 · 3e4dfd2
2 parents 5b16267 + 781d393
commit 3e4dfd2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/chrony/tests.py b/chrony/tests.py
@@ -98,8 +98,6 @@ def test_merge(self):
             ),
             columns=stamp_columns
         )
-        pd.util.testing.assert_frame_equal(df3, df2)
-        fill_na_dataframe(df3)
         pd.util.testing.assert_frame_equal(df3, df2b)
         df4 = pd.DataFrame(
             to_spans(

diff --git a/chrony/timespans.py b/chrony/timespans.py
@@ -119,6 +119,7 @@ def to_stamps(df, state_columns, value_columns, beg_col='ts_beg', end_col='ts_en
     retval.sort_values('ts', inplace=True)
     if retval['ts'].duplicated().sum():
         raise IntegrityError
+    fill_na_dataframe(retval)
     return retval