Merge pull request #2950 from jenshnielsen/name_legacy_test_datasets

Name legacy test datasets

qcodes/tests/legacy/test_data.py

@@ -288,7 +288,7 @@ def test_to_xarray(self):
         xarray_dataarray = data.to_xarray()
 
     def test_xarray_conversions(self):
-        da = DataSet1D().x_set
+        da = DataSet1D(name="TestDataArray_test_xarray_conversions").x_set
 
         xarray_dictionary = data_array_to_xarray_dictionary(da)
 
@@ -599,15 +599,15 @@ def test_remove_array(self):
         self.assertFalse('z' in m.arrays)
 
     def test_xarray_conversions(self):
-        qd = DataSet1D()
+        qd = DataSet1D(name="TestNewData_test_xarray_conversions")
         xarray_data_set = qcodes_dataset_to_xarray_dataset(qd)
         qd_transformed = xarray_dataset_to_qcodes_dataset(xarray_data_set)
         m = qd.default_parameter_array()
         mt = qd_transformed.default_parameter_array()
 
         for key in ["name", "unit"]:
             self.assertEqual(getattr(m, key), getattr(mt, key))
-        qd2 = DataSet2D()
+        qd2 = DataSet2D(name="TestNewData_test_xarray_conversions")
         xarray_data_set = qcodes_dataset_to_xarray_dataset(qd2)
         qd2_transformed = xarray_dataset_to_qcodes_dataset(xarray_data_set)
 

qcodes/tests/legacy/test_generic_formatter.py

@@ -47,4 +47,4 @@ class TestNoSorting(TestCase):
                              )
 
     def test_can_measure(self):
-        qcodes.measure.Measure(self.param).run()
+        qcodes.measure.Measure(self.param).run(name="test_no_sorting")

qcodes/tests/legacy/test_loop.py

@@ -115,7 +115,7 @@ def test_repr(self):
     def test_measurement_with_many_nans(self):
         loop = Loop(self.p1.sweep(0, 1, num=10),
                     delay=0.05).each(self.p4_crazy)
-        ds = loop.get_data_set()
+        ds = loop.get_data_set(name="test_measurement_with_many_nans")
         loop.run()
 
         # assert that both the snapshot and the datafile are there