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

Fix update scripts broken in #269 + unrelated docs fixes #273

Merged
merged 2 commits into from
Feb 8, 2025

Conversation

taldcroft
Copy link
Member

@taldcroft taldcroft commented Feb 8, 2025

Description

Somehow a critical problem slipped through in #269 and two scripts used in daily updates of the cheta archive are broken. This was found in daily masters testing. This PR fixes them.

The fetch.ENG_ARCHIVE symbol is still not defined, but the two scripts now refer to the original cheta.remote_access.ENG_ARCHIVE.

In addition, I noticed a few lingering sphinx doc build warnings and fixed them.

Interface impacts

None (given the change in #269).

Testing

Unit tests

  • Mac
(ska3-flight-2025.0rc2) ➜  cheta git:(fix-fetch-engarchive-break) git rev-parse --short HEAD
de25a1e
(ska3-flight-2025.0rc2) ➜  cheta git:(fix-fetch-engarchive-break) pytest
========================================== test session starts ===========================================
platform darwin -- Python 3.12.8, pytest-8.3.4, pluggy-1.5.0
rootdir: /Volumes/git
configfile: pytest.ini
plugins: hypothesis-6.125.2, doctestplus-1.3.0, anyio-4.7.0, timeout-2.3.1
collected 175 items                                                                                      

cheta/tests/test_comps.py ............................................................             [ 34%]
cheta/tests/test_data_source.py .........                                                          [ 39%]
cheta/tests/test_fetch.py .................................                                        [ 58%]
cheta/tests/test_intervals.py .........................                                            [ 72%]
cheta/tests/test_orbit.py .                                                                        [ 73%]
cheta/tests/test_remote_access.py ......                                                           [ 76%]
cheta/tests/test_sync.py ........                                                                  [ 81%]
cheta/tests/test_units.py ...........                                                              [ 87%]
cheta/tests/test_units_reversed.py ...........                                                     [ 93%]
cheta/tests/test_utils.py ...........                                                              [100%]

===================================== 175 passed in 83.35s (0:01:23) =====================================

Independent check of unit tests by Jean

  • Linux
jeanconn-fido> pytest
============================================================ test session starts =============================================================
platform linux -- Python 3.12.8, pytest-8.3.4, pluggy-1.5.0
rootdir: /proj/sot/ska/jeanproj/git
configfile: pytest.ini
plugins: anyio-4.7.0, timeout-2.3.1
collected 175 items                                                                                                                          

cheta/tests/test_comps.py ............................................................                                                 [ 34%]
cheta/tests/test_data_source.py .........                                                                                              [ 39%]
cheta/tests/test_fetch.py .................................                                                                            [ 58%]
cheta/tests/test_intervals.py .........................                                                                                [ 72%]
cheta/tests/test_orbit.py .                                                                                                            [ 73%]
cheta/tests/test_remote_access.py ......                                                                                               [ 76%]
cheta/tests/test_sync.py ........                                                                                                      [ 81%]
cheta/tests/test_units.py ...........                                                                                                  [ 87%]
cheta/tests/test_units_reversed.py ...........                                                                                         [ 93%]
cheta/tests/test_utils.py ...........                                                                                                  [100%]

============================================================== warnings summary ==============================================================
cheta/cheta/tests/test_comps.py::test_cmd_states
  /proj/sot/ska3/test/lib/python3.12/site-packages/setuptools_scm/git.py:312: UserWarning: git archive did not support describe output
    warnings.warn("git archive did not support describe output")

-- Docs: https://docs.pytest.org/en/stable/how-to/capture-warnings.html
================================================= 175 passed, 1 warning in 308.05s (0:05:08) =================================================
jeanconn-fido> python -c "import cxotime; print(cxotime.__version__)"
3.9.3.dev11+g9864220
jeanconn-fido> python -c "import chandra_time; print(chandra_time.__version__)"
4.1.3.dev8+g600c592
jeanconn-fido> git rev-parse HEAD
de25a1e2280cd0c9cb42cb9514dad1a96723265e

Functional tests

Doing functional testing by hand is a bit labor intensive, but this will get testing in daily masters testing. I propose merging this based on unit tests and analysis and then confirm the masters test passes.

Sorry, something went wrong.

@taldcroft taldcroft changed the title Fix update scripts broken in #269 Fix update scripts broken in #269 + unrelated docs fix Feb 8, 2025
@taldcroft taldcroft changed the title Fix update scripts broken in #269 + unrelated docs fix Fix update scripts broken in #269 + unrelated docs fixes Feb 8, 2025
@taldcroft taldcroft requested a review from jeanconn February 8, 2025 12:08
@jeanconn
Copy link
Contributor

jeanconn commented Feb 8, 2025

For functional tests, the ska_testr tests don't take much user time, so I did that and I think that covers functional tests

***              cheta test_make_archive_long.sh   pass ***
***              cheta         test_namespace.py   pass ***
***              cheta              test_unit.py   pass ***
***              cheta        post_check_logs.py   pass ***

Though it looks like test_make_archive_long.sh does not use check_integrity. Should a test of that script be added somewhere in the long tests?

@taldcroft taldcroft merged commit 1593d6f into master Feb 8, 2025
2 checks passed
@taldcroft taldcroft deleted the fix-fetch-engarchive-break branch February 8, 2025 19:17
@taldcroft
Copy link
Member Author

Thanks for the testing!

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