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

Port test_multiple_multimeter from SLI-2-Py #2754

Merged
merged 9 commits into from
Aug 30, 2023
Merged

Port test_multiple_multimeter from SLI-2-Py #2754

merged 9 commits into from
Aug 30, 2023

Commits on Apr 29, 2023

  1. Relocate test_multimeter_freeze()

    @nicolossus
    nicolossus committed Apr 29, 2023
    Configuration menu
    Copy the full SHA
    f218bb0 View commit details
    Browse the repository at this point in the history

  2. sli-2-py: port test_multiple_multimeter

    @nicolossus
    nicolossus committed Apr 29, 2023
    Configuration menu
    Copy the full SHA
    56d33fd View commit details
    Browse the repository at this point in the history

Commits on May 24, 2023

  1. Merge branch 'master' into port_test_multiple_multimeter

    @nicolossus
    nicolossus committed May 24, 2023
    Configuration menu
    Copy the full SHA
    45c7ca8 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Merge branch 'master' 

    Conflicts:
	testsuite/pytests/sli2py_recording/test_multimeter_freeze_thaw.py
	testsuite/pytests/test_multimeter.py
    @nicolossus
    nicolossus committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    e22f591 View commit details
    Browse the repository at this point in the history

  2. Sort imports

    @nicolossus
    nicolossus committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    f015653 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2023

  1. Remove duplicates from merge error

    @nicolossus
    nicolossus committed Aug 28, 2023
    Configuration menu
    Copy the full SHA
    4b020be View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. Only test identical recording for one model

    @nicolossus
    nicolossus committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    746d68f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' 

    Conflicts:
	testsuite/pytests/test_multimeter.py
    @nicolossus
    nicolossus committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    22f54cd View commit details
    Browse the repository at this point in the history

  3. Combine old and new test for correctly recorded data

    @nicolossus
    nicolossus committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    dd883a0 View commit details
    Browse the repository at this point in the history