Skip to content

Commit

Permalink
Fixing pytest call and artifacts waiting script
Browse files Browse the repository at this point in the history
  • Loading branch information
Greg Blumberg committed Jan 18, 2019
1 parent 052c8a5 commit 45d6a6c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ steps:
sleep 3 # give xvfb some time to start
xdpyinfo | grep dimensions # Check display dimensions
python ci/screen.py # Check display dimensions as seen by PySide
pytest -v --doctest-modules --junitxml=junit/test-results.xml
pytest -v --junitxml=junit/test-results.xml
mv examples/data/14061619.png examples/data/14061619_linux.png
displayName: "Installing code and running tests (Linux)"
condition: eq( variables['Agent.OS'], 'Linux')
Expand All @@ -66,7 +66,7 @@ steps:
system_profiler SPDisplaysDataType | grep Resolution # Check display dimensions using OS tools
sudo python ci/screen.py # Check display dimensions as seen by PySide
sudo python setup.py -q install
#sudo pytest -v --doctest-modules --junitxml=junit/test-results.xml
#sudo pytest -v --junitxml=junit/test-results.xml
#sudo mv examples/data/14061619.png examples/data/14061619_mac.png
sudo pyinstaller runsharp/SHARPpy-osx.spec --noconsole --onefile --log-level DEBUG
sudo chmod 777 dist/SHARPpy.app
Expand All @@ -85,7 +85,7 @@ steps:
- script: |
python ci/screen.py
python setup.py -q install --user
#pytest -v --doctest-modules --junitxml=junit/test-results.xml
#pytest -v --junitxml=junit/test-results.xml
#move examples\\data\\14061619.png examples\\data\\14061619_win.png
pyinstaller runsharp/SHARPpy-win7-64.spec --log-level DEBUG
displayName: "Installing code and running tests (Windows)"
Expand Down
2 changes: 1 addition & 1 deletion ci/check_artifact_dir.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
files = glob.glob(path + '/*zip')
while len(files) != 2 and (datetime.now() - now).total_seconds() < timeout:
files = glob.glob(path + '/*zip')
print(num_files)
print(files)

print("ALL FILES IN THE BUILD ARTIFACT STAGING DIRECTORY...NEXT STEP SHOULD BE DEPLOYING")

0 comments on commit 45d6a6c

Please sign in to comment.