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.

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

Issue 2820 - Fix CI tests #4365

Merged
merged 2 commits into from Oct 22, 2020
Merged

Issue 2820 - Fix CI tests #4365

merged 2 commits into from Oct 22, 2020

Conversation

aadhikar
Copy link
Contributor

@aadhikar aadhikar commented Oct 8, 2020

Bug Description: tickets/ticket47973_test.py test had failures in CI nightly runs

Fix Description: Fixed the failure and also changed the code to use DSLdapObject
moved the code into the schema test suite.

Relates: #2820

Reviewed by: ??

from lib389._constants import TASK_WAIT
from lib389._constants import DEFAULT_SUFFIX
from lib389._mapped_object import DSLdapObjects
from lib389.idm.user import UserAccounts

pytestmark = pytest.mark.tier1
Copy link
Contributor Author

Choose a reason for hiding this comment

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

originally tickets/ticket47973_test.py was under tier2.

@droideck droideck linked an issue Oct 8, 2020 that may be closed by this pull request
@droideck droideck removed a link to an issue Oct 8, 2020
Copy link
Member

@droideck droideck left a comment

Choose a reason for hiding this comment

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

The rest looks good to me. But maybe @Firstyear will something to say...

dirsrvtests/tests/suites/schema/schema_reload_test.py Outdated Show resolved Hide resolved
Bug Description: tickets/ticket47973_test.py test had failures in CI nightly runs

Fix Description: Fixed the failure and also changed the code to use DSLdapObject
moved the code into the schema test suite.

Relates: 389ds#2820

Reviewed by: Simon(droideck)
@droideck
Copy link
Member

droideck commented Oct 9, 2020

Please, avoid 'git push --force' option as it's hard to follow what changes were made.
Just add new commits as it's mentioned above:

Add more commits by pushing to the fix-ticket47973 branch on aadhikar/389-ds-base.

@aadhikar
Copy link
Contributor Author

aadhikar commented Oct 9, 2020

@droideck opps, sure i will keep that in mind. Normal push was giving me some error i guess but sure I will completely avoid it.

Copy link
Member

@droideck droideck left a comment

Choose a reason for hiding this comment

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

@droideck opps, sure i will keep that in mind. Normal push was giving me some error i guess but sure I will completely avoid it.

No problem:) Ping me on IRC if you have some annoying issue and we'll try to figure it out.

dirsrvtests/tests/suites/schema/schema_reload_test.py Outdated Show resolved Hide resolved
dirsrvtests/tests/suites/schema/schema_reload_test.py Outdated Show resolved Hide resolved

# While we wait for the task to complete search for our user
search_count = 0
while search_count < 10:
# Now check the user is still being returned
# Check if task is complete
assert user.exists()
task_entry = topo.standalone.tasks.entry
if topo.standalone.tasks.checkTask(task_entry)[0]:
if task.get_exit_code() == 0:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

didn't use task.wait() here as the test needs it to be a race condition. Also made changes in other tests.

@aadhikar aadhikar requested a review from droideck October 9, 2020 20:41
Copy link
Member

@droideck droideck left a comment

Choose a reason for hiding this comment

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

LGTM!

@droideck droideck merged commit 8742f65 into 389ds:master Oct 22, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants