Merge branch 'alatiera/minor-python-tests' into 'main'

tests: Modernize some more python tests

See merge request gstreamer/gstreamer!6039
This commit is contained in:
Jordan Petridіs 2024-05-03 19:10:06 +00:00
commit c5f960aa39
3 changed files with 9 additions and 6 deletions

View file

@ -262,7 +262,7 @@ class GESSimpleTimelineTest(GESTest):
return clip
def assertElementAreEqual(self, ref, element):
self.assertTrue(isinstance(element, type(ref)), "%s and %s do not have the same type!" % (ref, element))
self.assertIsInstance(element, type(ref), "%s and %s do not have the same type!" % (ref, element))
props = [p for p in ref.list_properties() if p.name not in ['name']
and not GObject.type_is_a(p.value_type, GObject.Object)]
@ -276,8 +276,11 @@ class GESSimpleTimelineTest(GESTest):
value.init(p.value_type)
value.set_value(element.get_property(pname))
self.assertTrue(Gst.value_compare(refval, value) == Gst.VALUE_EQUAL,
"%s are not equal: %s != %s\n %s != %s" % (pname, value, refval, element, ref))
self.assertEqual(
Gst.value_compare(refval, value),
Gst.VALUE_EQUAL,
"%s are not equal: %s != %s\n %s != %s" % (pname, value, refval, element, ref)
)
if isinstance(ref, GES.TrackElement):
self.assertElementAreEqual(ref.get_nleobject(), element.get_nleobject())

View file

@ -188,7 +188,7 @@ class TestTrackElements(common.GESSimpleTimelineTest):
self.assertEqual(effect.props.track, video_track)
audio_source = test_clip.find_track_element(None, GES.AudioSource)
self.assertFalse(audio_source is None)
self.assertIsNotNone(audio_source)
self.assertEqual(audio_source.get_child_property("volume")[1], 0.0)
self.assertEqual(audio_source.props.track, audio_track)
self.assertEqual(video_source.props.track, video_track)
@ -367,7 +367,7 @@ class TestTrackElements(common.GESSimpleTimelineTest):
image_src, = clip.get_children(True)
self.assertTrue(image_src.get_asset().is_image())
self.assertTrue(isinstance(image_src, GES.VideoUriSource))
self.assertIsInstance(image_src, GES.VideoUriSource)
imagefreeze, = [e for e in image_src.get_nleobject().iterate_recurse()
if e.get_factory().get_name() == "imagefreeze"]

View file

@ -99,7 +99,7 @@ class ServerConnectionTestCase(unittest.TestCase):
# self.browser = create_chrome_driver()
self.addCleanup(self.browser.quit)
self.html_source = os.environ.get('TEST_HTML_SOURCE')
self.assertIsNot(self.html_source, None)
self.assertIsNotNone(self.html_source)
self.assertNotEqual(self.html_source, '')
self.html_source = 'file://' + self.html_source + '/index.html'