-
Notifications
You must be signed in to change notification settings - Fork 11
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
More fixes for AM18 #132
More fixes for AM18 #132
Conversation
74ce110
to
0694ad2
Compare
This is ready for code review. Under |
99b997e
to
04943e8
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some questions following CR @sevein. Otherwise it looks pretty good.
I haven't tried running these features yet. Are we expecting to run them on each of the test servers?
@@ -88,7 +88,7 @@ def _navigate_to_transfer_directory_and_click(self, path): | |||
# should be, i.e., this is now an absolute XPath. | |||
folder_label_xpath = c.XPATH_TREEITEM_NEXT_SIBLING.join(xtrail) | |||
# Wait until folder is visible. | |||
block = WebDriverWait(self.driver, 3) | |||
block = WebDriverWait(self.driver, 20) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should be using the wait values from here:
archivematica-acceptance-tests/amuser/constants.py
Lines 352 to 371 in 1519dc6
# Generable, reusable wait times, in seconds | |
NIHILISTIC_WAIT = WAIT_FACTOR * 20 | |
APATHETIC_WAIT = WAIT_FACTOR * 10 | |
PESSIMISTIC_WAIT = WAIT_FACTOR * 5 | |
MEDIUM_WAIT = WAIT_FACTOR * 3 | |
OPTIMISTIC_WAIT = WAIT_FACTOR * 1 | |
QUICK_WAIT = WAIT_FACTOR * 0.5 | |
MICRO_WAIT = WAIT_FACTOR * 0.25 | |
# Use-case-specific maximum attempt counters | |
MAX_CLICK_TRANSFER_DIRECTORY_ATTEMPTS = 5 | |
MAX_CLICK_AIP_DIRECTORY_ATTEMPTS = 5 | |
MAX_NAVIGATE_AIP_ARCHIVAL_STORAGE_ATTEMPTS = 10 | |
MAX_DOWNLOAD_AIP_ATTEMPTS = 20 | |
MAX_CHECK_AIP_STORED_ATTEMPTS = 60 | |
MAX_CHECK_METS_LOADED_ATTEMPTS = 60 | |
MAX_SEARCH_AIP_ARCHIVAL_STORAGE_ATTEMPTS = 120 | |
MAX_SEARCH_DIP_BACKLOG_ATTEMPTS = 120 | |
MAX_CHECK_TRANSFER_APPEARED_ATTEMPTS = 1000 | |
MAX_CHECK_FOR_MS_GROUP_ATTEMPTS = 7200 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These names! 😆
amuser/am_browser_ingest_ability.py
Outdated
@@ -141,7 +141,7 @@ def _navigate_to_aip_directory_and_click(self, path): | |||
is_last = True | |||
self.cwd.append(folder) | |||
folder_id = '_'.join(self.cwd) | |||
block = WebDriverWait(self.driver, 1) | |||
block = WebDriverWait(self.driver, 10) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Likewise here.
archivematica-acceptance-tests/amuser/constants.py
Lines 352 to 371 in 1519dc6
# Generable, reusable wait times, in seconds | |
NIHILISTIC_WAIT = WAIT_FACTOR * 20 | |
APATHETIC_WAIT = WAIT_FACTOR * 10 | |
PESSIMISTIC_WAIT = WAIT_FACTOR * 5 | |
MEDIUM_WAIT = WAIT_FACTOR * 3 | |
OPTIMISTIC_WAIT = WAIT_FACTOR * 1 | |
QUICK_WAIT = WAIT_FACTOR * 0.5 | |
MICRO_WAIT = WAIT_FACTOR * 0.25 | |
# Use-case-specific maximum attempt counters | |
MAX_CLICK_TRANSFER_DIRECTORY_ATTEMPTS = 5 | |
MAX_CLICK_AIP_DIRECTORY_ATTEMPTS = 5 | |
MAX_NAVIGATE_AIP_ARCHIVAL_STORAGE_ATTEMPTS = 10 | |
MAX_DOWNLOAD_AIP_ATTEMPTS = 20 | |
MAX_CHECK_AIP_STORED_ATTEMPTS = 60 | |
MAX_CHECK_METS_LOADED_ATTEMPTS = 60 | |
MAX_SEARCH_AIP_ARCHIVAL_STORAGE_ATTEMPTS = 120 | |
MAX_SEARCH_DIP_BACKLOG_ATTEMPTS = 120 | |
MAX_CHECK_TRANSFER_APPEARED_ATTEMPTS = 1000 | |
MAX_CHECK_FOR_MS_GROUP_ATTEMPTS = 7200 |
amuser/am_localfs_ability.py
Outdated
access files in the application environment when they're local. | ||
""" | ||
|
||
# pylint: disable=R0201 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can mark this as @staticmethod
instead of disabling pylint
. Right now that's what it is, even if in future it becomes something else.
This commit increases the default timeouts. This seems necessary when using the marionette stack, otherwise different errors are returned randomly at different points.
Hi @sevein I am unable to get consistent results with testing at the moment (policy check), here are two failures (but on third attempt it passed): First attempt: Unknown state, e.g. could have been after a few attempts and few other failed tests
After
Third attempt: 👍
Can maybe you or @ablwr flush your system, and give it a go first time around? See if it passes? |
@ross-spencer I've experienced that problem too but not as often. I suspect it's related to the new stack I'm using in Compose based on Marionette + WebDriver. Making the wait factor higher worked for Joel and me but even that way I've seen errors like yours a few times. On the other hand, it seems to work consistently the old way which we're planning to use in CI. I filed a bug at some point: #125, I thought that |
In addition to the `docker cp` and `scp` methods already available, this commit includes the ability to access files like sample data when it's simply available in the local filesystem.
04943e8
to
56b9e35
Compare
@sevein I hope I'm not jumping the gun, but because I am on European time, I'll be signing off soon. It sounds like the changes are resolved? So LGTM! 👍 |
This pull request adds four commits including compatibility fixes for Archivematica 1.8 and some tweaks addressing issues running AMAUAT in our development environment based on Docker Compose.
These changes were tested using the following command available in our development environment:
Replace
{tag}
as needed. Other forms of executing AMAUAT should still work. Santiago is planning to run them from CI before the AM18 release.Test results
mo-aip-reingest
icc
ipc
tpc
picc
uuids-dirs
premis-events
pid-binding
aip-encrypt-mirror
aip-encrypt
Issues found:
--tags=ipc
)--tags=ipc
)--tags=aip-encrypt --tags=uncompressed
)Connects to archivematica/Issues#193.