aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/base.py1
-rw-r--r--test/mock.py2
-rw-r--r--test/testdata/fake_converter.py14
-rw-r--r--test/uitests.sikuli/config.py6
-rw-r--r--test/uitests.sikuli/datafiles.py2
-rw-r--r--test/uitests.sikuli/lvc_steps.py4
-rw-r--r--test/uitests.sikuli/test_android_conversions.py4
-rw-r--r--test/uitests.sikuli/test_apple_conversions.py4
-rw-r--r--test/uitests.sikuli/test_choose_files.py2
-rw-r--r--test/uitests.sikuli/test_clear_finished_conversions.py2
-rw-r--r--test/uitests.sikuli/test_conversions.py2
-rw-r--r--test/uitests.sikuli/test_other_conversions.py2
-rw-r--r--test/uitests.sikuli/test_output_settings.py2
-rw-r--r--test/uitests.sikuli/test_remove_files.py2
14 files changed, 26 insertions, 23 deletions
diff --git a/test/base.py b/test/base.py
index 397274e..5eddb8f 100644
--- a/test/base.py
+++ b/test/base.py
@@ -1,6 +1,7 @@
import os.path
import unittest
+
class Test(unittest.TestCase):
def setUp(self):
diff --git a/test/mock.py b/test/mock.py
index 58e8a87..c31bdf2 100644
--- a/test/mock.py
+++ b/test/mock.py
@@ -359,6 +359,8 @@ _deleted = sentinel.DELETED
class OldStyleClass:
pass
+
+
ClassType = type(OldStyleClass)
diff --git a/test/testdata/fake_converter.py b/test/testdata/fake_converter.py
index 9f89d47..bd049bc 100644
--- a/test/testdata/fake_converter.py
+++ b/test/testdata/fake_converter.py
@@ -5,27 +5,27 @@ import json
filename, output = sys.argv[1:3]
if 'error' in filename:
- print json.dumps({'finished': True, 'error': 'test error'})
+ print(json.dumps({'finished': True, 'error': 'test error'}))
sys.exit(1)
if os.path.exists(output):
- print json.dumps({'finished': True,
- 'error': '%r existed when we started' % (
- output,)})
+ print(json.dumps({
+ 'finished': True,
+ 'error': '%r existed when we started' % (output,)}))
sys.exit(1)
time.sleep(0.5)
RANGE = 5
for i in range(RANGE):
- print json.dumps({
+ print(json.dumps({
'filename': filename,
'output': output,
'duration': RANGE,
'progress': i,
'eta': RANGE - i
- })
+ }))
time.sleep(0.1)
with file(output, 'w') as f:
f.write('blank')
-print json.dumps({'finished': True})
+print(json.dumps({'finished': True}))
diff --git a/test/uitests.sikuli/config.py b/test/uitests.sikuli/config.py
index e326c17..27e7a74 100644
--- a/test/uitests.sikuli/config.py
+++ b/test/uitests.sikuli/config.py
@@ -30,7 +30,7 @@ def get_os_name():
elif "LINUX" in str(Env.getOS()):
return "lin"
else:
- print ("I don't know how to handle platform '%s'", Env.getOS())
+ print("I don't know how to handle platform '%s'", Env.getOS())
def launch_cmd():
@@ -46,6 +46,6 @@ def launch_cmd():
"Libre Video Converter",
"LibreConverter.exe")
else:
- print get_os_name()
- print launch_cmd
+ print(get_os_name())
+ print(launch_cmd)
return launch_cmd
diff --git a/test/uitests.sikuli/datafiles.py b/test/uitests.sikuli/datafiles.py
index 6226154..5d11ed0 100644
--- a/test/uitests.sikuli/datafiles.py
+++ b/test/uitests.sikuli/datafiles.py
@@ -166,5 +166,5 @@ class TestData(object):
if not many:
TESTFILES = TESTFILES[:1]
- print TESTFILES
+ print(TESTFILES)
return (DATADIR, TESTFILES)
diff --git a/test/uitests.sikuli/lvc_steps.py b/test/uitests.sikuli/lvc_steps.py
index edb8a9a..5723b6a 100644
--- a/test/uitests.sikuli/lvc_steps.py
+++ b/test/uitests.sikuli/lvc_steps.py
@@ -21,7 +21,7 @@ def test_data(many=False, new=False):
if not many:
TESTFILES = TESTFILES[:1]
- print TESTFILES
+ print(TESTFILES)
return DATADIR, TESTFILES
@@ -38,7 +38,7 @@ def device_output(option):
@step('I browse for (?:a|several)( new)? file(s)?')
def browse_for_files(step, new, several): # file or files determines 1 or many
datadir, testfiles = test_data(several, new)
- print testfiles
+ print(testfiles)
world.lvc.browse_for_files(datadir, testfiles)
diff --git a/test/uitests.sikuli/test_android_conversions.py b/test/uitests.sikuli/test_android_conversions.py
index cb86066..b904374 100644
--- a/test/uitests.sikuli/test_android_conversions.py
+++ b/test/uitests.sikuli/test_android_conversions.py
@@ -32,7 +32,7 @@ def test_android_size_output_default():
def device_defaults(device_output, lvc):
- print device_output
+ print(device_output)
lvc.choose_device_conversion(device_output)
width = device.device_attr(device_output, 'width')
height = device.device_attr(device_output, 'height')
@@ -44,7 +44,7 @@ def device_defaults(device_output, lvc):
def convert_to_format(device_output):
"""Scenario: Test items are converted to the specified format.
"""
- print device_output
+ print(device_output)
lvc = MVCGui()
lvc.lvc_focus()
expected_failures = ['fake_video.mp4']
diff --git a/test/uitests.sikuli/test_apple_conversions.py b/test/uitests.sikuli/test_apple_conversions.py
index 4761a05..7b9bc3a 100644
--- a/test/uitests.sikuli/test_apple_conversions.py
+++ b/test/uitests.sikuli/test_apple_conversions.py
@@ -33,7 +33,7 @@ def test_apple_size_output_default():
def device_defaults(device_output, lvc):
- print device_output
+ print(device_output)
lvc.choose_device_conversion(device_output)
width = device.device_attr(device_output, 'width')
height = device.device_attr(device_output, 'height')
@@ -43,7 +43,7 @@ def device_defaults(device_output, lvc):
def convert_to_format(device_output):
- print device_output
+ print(device_output)
expected_failures = ['fake_video.mp4']
lvc = MVCGui()
lvc.lvc_focus()
diff --git a/test/uitests.sikuli/test_choose_files.py b/test/uitests.sikuli/test_choose_files.py
index 8140a60..1a93da0 100644
--- a/test/uitests.sikuli/test_choose_files.py
+++ b/test/uitests.sikuli/test_choose_files.py
@@ -22,7 +22,7 @@ class Test_Choose_Files(unittest.TestCase):
"""
self.lvc = MVCGui()
self.lvc.lvc_focus()
- print "starting test: ", self.shortDescription()
+ print("starting test: ", self.shortDescription())
self.output_dir = tempfile.mkdtemp()
self.lvc.choose_save_location(self.output_dir)
diff --git a/test/uitests.sikuli/test_clear_finished_conversions.py b/test/uitests.sikuli/test_clear_finished_conversions.py
index 9a0ff52..3962deb 100644
--- a/test/uitests.sikuli/test_clear_finished_conversions.py
+++ b/test/uitests.sikuli/test_clear_finished_conversions.py
@@ -26,7 +26,7 @@ class Test_Clear_Finished_Conversions(unittest.TestCase):
"""
self.lvc = MVCGui()
self.lvc.lvc_focus()
- print "starting test: ", self.shortDescription()
+ print("starting test: ", self.shortDescription())
datadir, testfiles = data.test_data()
self.lvc.browse_for_files(datadir, testfiles)
self.output_dir = tempfile.mkdtemp()
diff --git a/test/uitests.sikuli/test_conversions.py b/test/uitests.sikuli/test_conversions.py
index c186c62..449c6d5 100644
--- a/test/uitests.sikuli/test_conversions.py
+++ b/test/uitests.sikuli/test_conversions.py
@@ -26,7 +26,7 @@ class Test_Conversions(unittest.TestCase):
"""
self.lvc = MVCGui()
self.lvc.lvc_focus()
- print "starting test: ", self.shortDescription()
+ print("starting test: ", self.shortDescription())
datadir, testfiles = data.test_data(many=True)
self.lvc.browse_for_files(datadir, testfiles)
self.output_dir = tempfile.mkdtemp()
diff --git a/test/uitests.sikuli/test_other_conversions.py b/test/uitests.sikuli/test_other_conversions.py
index 9d866e5..f02be43 100644
--- a/test/uitests.sikuli/test_other_conversions.py
+++ b/test/uitests.sikuli/test_other_conversions.py
@@ -20,7 +20,7 @@ def test_other_conversions():
def convert_to_format(device_output):
- print device_output
+ print(device_output)
expected_failures = ['fake_video.mp4']
lvc = MVCGui()
lvc.lvc_focus()
diff --git a/test/uitests.sikuli/test_output_settings.py b/test/uitests.sikuli/test_output_settings.py
index 532cd4d..b44e5a0 100644
--- a/test/uitests.sikuli/test_output_settings.py
+++ b/test/uitests.sikuli/test_output_settings.py
@@ -24,7 +24,7 @@ class Test_Custom_Settings(unittest.TestCase):
"""
self.lvc = MVCGui()
self.lvc.lvc_focus()
- print "starting test: ", self.shortDescription()
+ print("starting test: ", self.shortDescription())
datadir, testfiles = data.test_data(many=True)
self.lvc.browse_for_files(datadir, testfiles)
self.output_dir = tempfile.mkdtemp()
diff --git a/test/uitests.sikuli/test_remove_files.py b/test/uitests.sikuli/test_remove_files.py
index 94bad9c..e3e4a06 100644
--- a/test/uitests.sikuli/test_remove_files.py
+++ b/test/uitests.sikuli/test_remove_files.py
@@ -22,7 +22,7 @@ class Test_Remove_Files(unittest.TestCase):
"""
lvc = MVCGui()
lvc.lvc_focus()
- print "starting test: ", self.shortDescription()
+ print("starting test: ", self.shortDescription())
datadir, testfiles = data.test_data()
lvc.browse_for_files(datadir, testfiles)
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 03:54:14 +0000