Merge pull request #1547 from pijyoi/cleanup_ci

remove ProgressDialog from CI test
This commit is contained in:
Ogi Moore 2021-02-06 12:05:03 -08:00 committed by GitHub
commit feaa8fe5fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions

View File

@ -70,10 +70,6 @@ conditionalExamples = {
False, False,
reason="Test is being problematic on CI machines" reason="Test is being problematic on CI machines"
), ),
"ProgressDialog.py": exceptionCondition(
not(platform.system() == "Linux"),
reason="QXcbConnection: XCB error"
),
'GLVolumeItem.py': exceptionCondition( 'GLVolumeItem.py': exceptionCondition(
not(platform.system() == "Darwin" and not(platform.system() == "Darwin" and
tuple(map(int, platform.mac_ver()[0].split("."))) >= (10, 16) and tuple(map(int, platform.mac_ver()[0].split("."))) >= (10, 16) and

View File

@ -108,7 +108,6 @@ others = dict([
('DateAxisItem_QtDesigner', 'DateAxisItem_QtDesigner.py'), ('DateAxisItem_QtDesigner', 'DateAxisItem_QtDesigner.py'),
('GraphicsScene', 'GraphicsScene.py'), ('GraphicsScene', 'GraphicsScene.py'),
('MouseSelection', 'MouseSelection.py'), ('MouseSelection', 'MouseSelection.py'),
('ProgressDialog', 'ProgressDialog.py'),
]) ])
@ -118,3 +117,8 @@ trivial = dict([
('LogPlotTest', 'LogPlotTest.py'), # Plotting.py ('LogPlotTest', 'LogPlotTest.py'), # Plotting.py
('ViewLimits', 'ViewLimits.py'), # ViewBoxFeatures.py ('ViewLimits', 'ViewLimits.py'), # ViewBoxFeatures.py
]) ])
# examples that are not suitable for CI testing
skiptest = dict([
('ProgressDialog', 'ProgressDialog.py'), # modal dialog
])

View File

@ -199,7 +199,7 @@ def _generateItemSvg(item, nodes=None, root=None, options={}):
svg = QtSvg.QSvgGenerator() svg = QtSvg.QSvgGenerator()
svg.setOutputDevice(buf) svg.setOutputDevice(buf)
dpi = QtGui.QGuiApplication.primaryScreen().logicalDotsPerInchX() dpi = QtGui.QGuiApplication.primaryScreen().logicalDotsPerInchX()
svg.setResolution(dpi) svg.setResolution(int(dpi))
p = QtGui.QPainter() p = QtGui.QPainter()
p.begin(svg) p.begin(svg)

View File

@ -603,7 +603,7 @@ def runSubprocess(command, return_code=False, **kwargs):
if p.returncode != 0: if p.returncode != 0:
print(output) print(output)
err_fun = sp.CalledProcessError.__init__ err_fun = sp.CalledProcessError.__init__
if 'output' in inspect.getargspec(err_fun).args: if 'output' in inspect.getfullargspec(err_fun).args:
raise sp.CalledProcessError(p.returncode, command, output) raise sp.CalledProcessError(p.returncode, command, output)
else: else:
raise sp.CalledProcessError(p.returncode, command) raise sp.CalledProcessError(p.returncode, command)