Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/weird travis test fail #1587

Merged
merged 4 commits into from
Jun 3, 2019
Merged

Fix/weird travis test fail #1587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64c2c18
Remove redundant "is True"
WilliamHPNielsen Jun 3, 2019
4d3d38f
Add extra parentheses
WilliamHPNielsen Jun 3, 2019
352a6bd
Move parentheses
WilliamHPNielsen Jun 3, 2019
8cb620b
Split assert into several lines
WilliamHPNielsen Jun 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions qcodes/tests/dataset/helper_functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ def verify_data_dict(data: Dict[str, Dict[str, np.ndarray]],
"""
# check that all the expected parameters in the dict are
# included in the list of parameters
assert all(param in parameter_names for param in list(data.keys())) is True
assert all(param in parameter_names for param in list(data.keys()))
if dataframe is not None:
assert all(param in parameter_names for
param in list(dataframe.keys())) is True
param in list(dataframe.keys()))
for param in parameter_names:
innerdata = data[param]
verify_data_dict_for_single_param(innerdata,
Expand Down
8 changes: 4 additions & 4 deletions qcodes/tests/drivers/test_ami430.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,9 +354,9 @@ def test_field_limit_exception(current_driver):
current_driver.cartesian(set_point)

assert "field would exceed limit" in excinfo.value.args[0]
assert not all([a == b for a, b in zip(
current_driver.cartesian(), set_point
)])
vals_and_setpoints = zip(current_driver.cartesian(), set_point)
belief = not(all([val == sp for val, sp in vals_and_setpoints]))
assert belief


def test_cylindrical_poles(current_driver):
Expand Down Expand Up @@ -434,7 +434,7 @@ def test_ramp_rate_exception(current_driver):

def test_reducing_field_ramp_limit_reduces_a_higher_ramp_rate(ami430):
"""
When reducing field_ramp_limit, the actual ramp_rate should also be
When reducing field_ramp_limit, the actual ramp_rate should also be
reduced if the new field_ramp_limit is lower than the actual ramp_rate
now.
"""
Expand Down