Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Test TravisCI #95

Draft
wants to merge 7 commits into
base: upstream
Choose a base branch
from
Draft

Test TravisCI #95

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d3275b9
Test travis config
jrha Jun 4, 2018
185c8e7
Don't fail fast
jrha Jun 25, 2018
59ece30
Catch import errors as per @urbonegi's suggestion
jrha Jun 28, 2018
1e84317
Inspect virtualenv
jrha Jul 25, 2018
c0066e8
Inspect scratch directory and fake DSDB logs
jrha Jul 26, 2018
9b9af10
Fudge the environment passed to git
jrha Jul 26, 2018
7c83bb7
Test fake DSDB
jrha Jul 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions lib/aquilon/worker/processes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,18 @@

DSDB_ENABLED = config.getboolean("dsdb", "enable")

if DSDB_ENABLED:
# FIXME - this needs to be moved to depends.py after
# refactoring runtests.py and Config to allow override
# sys.path for python modules when running tests
# DSDB python client
try:
import ms.version
except ImportError:
pass
else:
ms.version.addpkg('setuptools', '0.6c11')
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this one is added? :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't know, I copied and pasted it from you?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i might have copied if from somewhere else. My bad. Actually we might release this fix ourselves next week and push to github. Will let you know then we can rebase this one :)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool

ms.version.addpkg("requests", "2.7.0")
ms.version.addpkg("requests-kerberos", "0.5-ms2")
ms.version.addpkg("kerberos", "1.1.5")
ms.version.addpkg("dns", "1.10.0")
ms.version.addpkg('ms.dsdb', '6.0.30')
if DSDB_ENABLED:
import ms.dsdb.client

# subprocess.Popen is not thread-safe in Python 2, so we need locking
Expand Down Expand Up @@ -1078,4 +1079,4 @@ def build_mako_lookup(config, kind, **kwargs):
return TemplateLookup(directories=directories, **kwargs)


DSDBRunner.snapshot_handlers['rack'] = DSDBRunner.snapshot_rack
DSDBRunner.snapshot_handlers['rack'] = DSDBRunner.snapshot_rack