Skip to content

Commit

Permalink
Merge branch 'tickets/DM-27168' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
czwa committed Nov 12, 2020
2 parents 18b9320 + f07870f commit c83d3a1
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/test_butler.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,13 +82,13 @@ def assertExposure(self, exp, ccd, checkFilter=True):
print("width: ", exp.getWidth())
print("height: ", exp.getHeight())
print("detector name: ", exp.getDetector().getName())
print("filter name: ", exp.getFilter().getFilterProperty().getName())
print("filter name: ", exp.getFilter().getCanonicalName())

self.assertEqual(exp.getWidth(), self.size[0])
self.assertEqual(exp.getHeight(), self.size[1])
self.assertEqual(exp.getDetector().getName(), "ccd%02d" % ccd)
if checkFilter:
self.assertEqual(exp.getFilter().getFilterProperty().getName(), self.filter)
self.assertEqual(exp.getFilter().getCanonicalName(), self.filter)

if display and ccd % 18 == 0:
global frame
Expand Down

0 comments on commit c83d3a1

Please sign in to comment.