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

Ticket 6556: Move emulator and tests to support #5

Merged
merged 58 commits into from
Jul 13, 2021
Merged

Ticket 6556: Move emulator and tests to support #5

merged 58 commits into from
Jul 13, 2021

Conversation

DominicOram
Copy link
Contributor

See ISISComputingGroup/IBEX#6555

This moves the test and emulator for the CCD100 into this directory.

To test:

  • With other branches pulled run make ioctests in this directory and confirm that the tests run and pass
  • Note that you will not see the output of the tests until they are finished unless you run set "MAKEFLAGS=-w -j 6" first

AdrianPotter and others added 30 commits January 6, 2017 15:17
Rename plankton_emulators to lewis_emulators because framework name h…
22ba8ba 
…as changed
@DominicOram
Added emulator
98a5be4
Real reading is left-justified and may be followed by spaces
d5dc095
Update __init__.py
a31208e
@FreddieAkeroyd
Merge pull request #17 from ISISComputingGroup/Ticket2371_EOL_fixes
22624e1 
Fixes missing final EOL
Tidied up the formatting for a lot of files
3a1fa2d
Merge pull request #18 from ISISComputingGroup/Ticket2379_Create_TPG2…
2e50a00 
…6x_Emulator

Ticket2379: Create TPG26x Emulator & Test Cases
Lewis import changed at v1.0.3
4a0877b
Framework versions need to be specified in latest verion of Lewis
fa5dfd1
Pin emulators to latest version
770faec
@DominicOram
Added new tests for the ccd100
cc62062
@DominicOram
Emulator can now throw errors like the device
578aff6
@DominicOram
Default to not error
f2e8f20
@DominicOram
Added tests for the CCD100
e0a3e29
@DominicOram
Added default state
b3e8cdc
@davidkeymer
Upgrade Lewis
c6e03e1
@esouthren
Update lewis_versions.py
3a34fb8 
Added new line
@esouthren
Merge pull request #55 from ISISComputingGroup/Ticket2386_Upgrade_Lewis
60daf13 
Upgrade Lewis
@Tom-Willemsen
Merge remote-tracking branch 'origin/master' into Ticket2916_reduce_C…
d00f6db 
…CD100_logging
@FreddieAkeroyd
Merge pull request #52 from ISISComputingGroup/Ticket2916_reduce_CCD1…
5648de4 
…00_logging

Ticket 2916: CCD100 can now throw errors like the device
Changed module name and updated emulator to pass temp test.
42fe379
@DominicOram
Added tests for different CCD100 addresses
5cd3eb3
@DominicOram
Removed accidental comments
1e4c9a1
@DominicOram
Added better behaviour for diff CCD100 addresses
95589a8
@Tom-Willemsen
Re-add lost init file, with comment saying do not delete.
9b5c930
@DominicOram
Allowed multiple emulators of the same type
f274445
@Tom-Willemsen
Merge pull request #64 from ISISComputingGroup/Ticket3230_ccd100_address
238c8a0 
Ticket 3230: Added better behaviour for diff CCD100 addresses
@aaron-long
Added connection tests for several devices.
8fb8a4f
@aaron-long
Updated tests to allow for connection checking. Fixed an issue with
f69ba9a 
the ioc_launcher.
@DominicOram
Fixed broken ccd100 tests
42f0930
DominicOram and others added 27 commits December 18, 2018 12:44
@DominicOram
Added an ignore flag to command builder arguments
ec9645d
@LiamPanchaud
Merge pull request #11 from ISISComputingGroup/Ticket2805_command_bui…
c2de0ff 
…lder_improvements

Ticket 2805: Added an ignore flag to command builder arguments
@Tom-Willemsen
Correct typo
c8828f7
@Tom-Willemsen
Correct typo
6322c21
@DominicOram
Updated lewis version
2f992eb
@Tom-Willemsen
Merge pull request #54 from ISISComputingGroup/Ticket4775_upgrade_lew…
db7c384 
…is_to_1.2.1

Ticket4775: Updated Lewis version
@Tom-Willemsen
Add decorator to some unstable tests.
d71ee22 
Not added to tests which are consistently failing.
@aaron-long
Merge pull request #245 from ISISComputingGroup/add_unstable_test_dec…
b1b3cf3 
…orator

Add decorator to some unstable tests.
@LilithCole
renamed to cryogenic_sms/CRYOSMS
a2b388b
@LilithCole
merge master
daa4c5c
@DominicOram
CCD100 logging tests now have some leeway in number of messages expected
54bfcd8
Merge pull request #288 from ISISComputingGroup/fix_system_tests
05b65e8 
Fix system tests
@DominicOram
CCD100 is now more forgiving on what it expects in the log
c48f419
@DominicOram
Revert typo
97f2b4a
@FreddieAkeroyd
Merge pull request #296 from ISISComputingGroup/fix_excessive_logging
a89c08e 
Fix excessive logging
@DominicOram
Updated lewis version to 1.2.2
8899037
@aaron-long
CCD100 - PEP8 fix
aebb397
@aaron-long
Updated a number of imports, python3 syntax changes and minor PEP8 vi…
ff50ed4 
…olations
@aaron-long
Fixed variable name for lewis version number
3fbd97f
@rerpha
Merge pull request #87 from ISISComputingGroup/Ticket4889_convert_dev…
998622f 
…ice_emulator_to_python3

Ticket 4889 - Convert device emulator to python3
@DominicOram
Updated to use latest lewis version and convert strings correctly
5865386
@DominicOram
Update lewis version
3513c4b
@DominicOram
Merge branch 'master' of C:/Instrument/Dev/EPICS-IOC_Test_Framework
9922853
@DominicOram
Merge branch 'master' of C:/Instrument/Dev/EPICS-DeviceEmulator into …
60fdba2 
…Ticket6556_move_emulator_and_tests
@DominicOram
Renaming test and emulator files
33e7b49
@DominicOram
Added command for running ioc test
b768904
@DominicOram
Added a bat file for ease of running
92ce510
@aaron-long aaron-long merged commit d13d02e into master Jul 13, 2021
@aaron-long aaron-long deleted the Ticket6556_move_emulator_and_tests branch July 13, 2021 10:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@aaron-long aaron-long aaron-long approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@DominicOram @aaron-long @FreddieAkeroyd @davidkeymer @esouthren @Tom-Willemsen @LiamPanchaud @LilithCole @rerpha