fix compare dataset name

erdc · Jul 6, 2017 · 0304d64 · 0304d64
1 parent f1835a5
commit 0304d64
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/tests/test_rapidpy.py b/tests/test_rapidpy.py
@@ -295,10 +295,10 @@ def test_convert_file_to_be_cf_compliant_new_format_comid_lat_lon_z():
     d2 = Dataset(cf_qout_file_solution)
     assert (d1.dimensions.keys() == d2.dimensions.keys())
     assert (d1.variables.keys() == d2.variables.keys())
-    assert ((d1.variables['time'][:] == d1.variables['time'][:]).all())
-    assert ((d1.variables['rivid'][:] == d1.variables['rivid'][:]).all())
-    assert ((d1.variables['lat'][:] == d1.variables['lat'][:]).all())
-    assert ((d1.variables['lon'][:] == d1.variables['lon'][:]).all())
+    assert ((d1.variables['time'][:] == d2.variables['time'][:]).all())
+    assert ((d1.variables['rivid'][:] == d2.variables['rivid'][:]).all())
+    assert ((d1.variables['lat'][:] == d2.variables['lat'][:]).all())
+    assert ((d1.variables['lon'][:] == d2.variables['lon'][:]).all())
     d1.close()
     d2.close()
 
@@ -335,8 +335,8 @@ def test_convert_file_to_be_cf_compliant_new_format():
     d2 = Dataset(cf_qout_file_solution)
     assert (d1.dimensions.keys() == d2.dimensions.keys())
     assert (d1.variables.keys() == d2.variables.keys())
-    assert ((d1.variables['time'][:] == d1.variables['time'][:]).all())
-    assert ((d1.variables['rivid'][:] == d1.variables['rivid'][:]).all())
+    assert ((d1.variables['time'][:] == d2.variables['time'][:]).all())
+    assert ((d1.variables['rivid'][:] == d2.variables['rivid'][:]).all())
     d1.close()
     d2.close()
 
@@ -373,10 +373,10 @@ def test_convert_file_to_be_cf_compliant_original_format():
     d2 = Dataset(cf_qout_file_solution)
     assert (d1.dimensions.keys() == d2.dimensions.keys())
     assert (d1.variables.keys() == d2.variables.keys())
-    assert ((d1.variables['time'][:] == d1.variables['time'][:]).all())
-    assert ((d1.variables['rivid'][:] == d1.variables['rivid'][:]).all())
-    assert ((d1.variables['lat'][:] == d1.variables['lat'][:]).all())
-    assert ((d1.variables['lon'][:] == d1.variables['lon'][:]).all())
+    assert ((d1.variables['time'][:] == d2.variables['time'][:]).all())
+    assert ((d1.variables['rivid'][:] == d2.variables['rivid'][:]).all())
+    assert ((d1.variables['lat'][:] == d2.variables['lat'][:]).all())
+    assert ((d1.variables['lon'][:] == d2.variables['lon'][:]).all())
     d1.close()
     d2.close()
 
@@ -633,8 +633,8 @@ def test_cf_merge():
     d2 = Dataset(cf_merge_qout_file_solution)
     assert (d1.dimensions.keys() == d2.dimensions.keys())
     assert (d1.variables.keys() == d2.variables.keys())
-    assert ((d1.variables['time'][:] == d1.variables['time'][:]).all())
-    assert ((d1.variables['rivid'][:] == d1.variables['rivid'][:]).all())
+    assert ((d1.variables['time'][:] == d2.variables['time'][:]).all())
+    assert ((d1.variables['rivid'][:] == d2.variables['rivid'][:]).all())
     d1.close()
     d2.close()