Skip to content

Make file paths in tests agnostic to execution source path #2701 #2727

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
Merged
merged 30 commits into from
Oct 13, 2021
Merged

Make file paths in tests agnostic to execution source path #2701 #2727

merged 30 commits into from
Oct 13, 2021

Conversation

eldbud
Copy link
Contributor

@eldbud eldbud commented Oct 11, 2021 •
edited
Loading

  • added PROJECT_ROOT_PATH and TEST_DATA_PATH constants in conftest
  • added data_file function in conftest
  • converted usages of files from the data folder to use the data_file function

resolves #2701

Bibo-Joshi and others added 27 commits September 15, 2021 17:09
@Bibo-Joshi
Temporarily enable tests for the v14 branch
331c4f5
@harshil21 @Bibo-Joshi
Move and Rename TelegramDecryptionError to telegram.error.PassportDec…
9dc30cf 
…ryptionError (python-telegram-bot#2621)

* move telegramdecryptionerror to error.py

* Change error class name
@Poolitzer @Bibo-Joshi
Add Code Comment Guidelines to Contribution Guide (python-telegram-bo…
b089cc9 
…t#2612)

* feat: add docs about docs

* fix: improve looks

* fix: make link work

* fix: this looks better

* Improved markdown, updated link

* Less justifying

Co-authored-by: Bibo-Joshi <22366557+Bibo-Joshi@users.noreply.github.com>
@revolter @Bibo-Joshi
Improve Type Hinting for CallbackContext (python-telegram-bot#2587)
3a19383 
* Fix incomplete type annotations for CallbackContext

Co-authored-by: Hinrich Mahler <22366557+Bibo-Joshi@users.noreply.github.com>
@Poolitzer @Bibo-Joshi
Add Custom pytest Marker to Ease Development (python-telegram-bot#2628)
414a18c 
* Feat: Custom pytest marker

Co-authored-by: Bibo-Joshi <22366557+Bibo-Joshi@users.noreply.github.com>
@starry-shivam @Bibo-Joshi
Make BasePersistence Methods Abstract (python-telegram-bot#2624)
8edb49d 
* Make basepersistence methods abstractmethod

Signed-off-by: starry69 <starry369126@outlook.com>

Co-authored-by: Hinrich Mahler <22366557+Bibo-Joshi@users.noreply.github.com>
@Bibo-Joshi
Refactor Initialization of Persistence Classes (python-telegram-bot#2604
cce9c18 
)
@harshil21 @Bibo-Joshi
Remove __dict__ from __slots__ and drop Python 3.6 (python-telegr…
dc0207a 
…am-bot#2619, python-telegram-bot#2636)
@iota-008 @Bibo-Joshi
Remove day_is_strict argument of JobQueue.run_monthly (python-telegra…
4af252f 
…m-bot#2634)

Co-authored-by: Hinrich Mahler <22366557+Bibo-Joshi@users.noreply.github.com>
@Poolitzer @Bibo-Joshi
Drop Non-CallbackContext API (python-telegram-bot#2617)
b6e4b54
@harshil21 @Bibo-Joshi
Fix Signatures and Improve test_official (python-telegram-bot#2643)
4359812
@Bibo-Joshi
Remove Deprecated Functionality (python-telegram-bot#2644)
dbdd35e
@harshil21 @Bibo-Joshi
Add User Friendly Type Check For Init Of {Inline, Reply}KeyboardMarkup (
a7c7c82 
python-telegram-bot#2657)
@Bibo-Joshi @harshil21
Refine Dispatcher.dispatch_error (python-telegram-bot#2660)
8ac65fc 
Co-authored-by: Harshil <37377066+harshil21@users.noreply.github.com>
@harshil21
Warnings Overhaul (python-telegram-bot#2662)
66f0604
@Bibo-Joshi @harshil21
Clear Up Import Policy (python-telegram-bot#2671)
4f21c06 
Co-authored-by: Harshil <37377066+harshil21@users.noreply.github.com>
@Bibo-Joshi
Make InlineQuery.answer Raise ValueError (python-telegram-bot#2675)
5542a46
@Bibo-Joshi @harshil21 @Poolitzer
Doc Fixes (python-telegram-bot#2597)
2cf9311 
Co-authored-by: Harshil <37377066+harshil21@users.noreply.github.com>
Co-authored-by: poolitzer <25934244+Poolitzer@users.noreply.github.com>
@eldbud
Merge remote-tracking branch 'upstream/v14' into v14
bcc62bb 
# Conflicts:
#	telegram/bot.py
#	telegram/ext/callbackcontext.py
#	telegram/ext/dispatcher.py
#	telegram/ext/extbot.py
#	telegram/ext/jobqueue.py
#	tests/conftest.py
#	tests/test_bot.py
@eldbud
Merge remote-tracking branch 'upstream/v14' into v14
9ed515a
@eldbud
create test_data_path fixture
53e9b0e
@eldbud
on it
a2b01a5
@eldbud
in the process of making tests use the newly created data_file and cl…
46b5a7c 
…ass_data_file fixture
@eldbud
added PROJECT_ROOT_PATH and TEST_DATA_PATH constants, and data_file f…
0745488 
…unction to conftest, replaced usages of paths with the above wherever possible
@eldbud
Merge remote-tracking branch 'upstream/v14' into v14
d82473a
@eldbud
Merge branch 'v14' into Make_file_paths_in_tests_agnostic_to_executio…
c581f27 
…n_source_path_#2701

# Conflicts:
#	tests/test_bot.py
#	tests/test_files.py
#	tests/test_warnings.py
@eldbud
removed leftover print
dd0bead
@eldbud eldbud changed the title Make file paths in tests agnostic to execution source path #2701 Make file paths in tests agnostic to execution source path resolves #2701 Oct 11, 2021
@eldbud eldbud changed the title Make file paths in tests agnostic to execution source path resolves #2701 Make file paths in tests agnostic to execution source path #2701 Oct 11, 2021
@eldbud
Copy link
Contributor Author

eldbud commented Oct 11, 2021

tried all the ways the instructions provide to link this pr to the issue - commit with keyword and issue number in message, and also in the description. doesn't link...

@harshil21 Telegram GithubBot Revised
Copy link
Member

@eldbud Not your fault, it only works when the base branch is master apparently, we'll manually link and close it

@harshil21 harshil21 added the ⚙️ tests affected functionality: tests label Oct 12, 2021
@harshil21 harshil21 added this to the v14 milestone Oct 12, 2021
@Bibo-Joshi Bibo-Joshi linked an issue Oct 12, 2021 that may be closed by this pull request
[FEATURE/DISCUSSION] Make file paths in tests agnostic to execution source path #2701
Closed
@Bibo-Joshi
Copy link
Member

Overall looks good - nice contribution! I take it that you actually tested running the tests from different working directories?
Can you please merge v14 into this branch? IISC there are some commits are not in your branch yet and e.g. #2724 added new files to the tests

@eldbud
Copy link
Contributor Author

eldbud commented Oct 12, 2021

I take it that you actually tested running the tests from different working directories?

indeed :)

@eldbud
Copy link
Contributor Author

eldbud commented Oct 12, 2021 •
edited
Loading

I take it that you actually tested running the tests from different working directories?

indeed :)

i just rechecked my reply, and i see i do have a problem with test_webhook_ssl_just_for_telegram, when not running from project root. I'll attend to it later today.

@eldbud
Copy link
Contributor Author

eldbud commented Oct 12, 2021 •
edited
Loading

i just rechecked my reply, and i see i do have a problem with test_webhook_ssl_just_for_telegram, when not running from project root. I'll attend to it later today.

ok, fixed. pr is ready for merge unless there are any issues i need to attend to.

@Bibo-Joshi seems i have no authorization to request review ("reviewers" on the right side pane is empty, and clicking it does nothing)

@Bibo-Joshi Bibo-Joshi merged commit 1adc96c into python-telegram-bot:v14 Oct 13, 2021
@Bibo-Joshi
Copy link
Member

Thanks for the nice contribution :)

@github-actions github-actions bot locked and limited conversation to collaborators Oct 14, 2021
@harshil21 harshil21 added the hacktoberfest-accepted other: hacktoberfest-accepted label Oct 30, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
hacktoberfest-accepted other: hacktoberfest-accepted ⚙️ tests affected functionality: tests
Projects
None yet
Milestone
v20.0a0
Development

Successfully merging this pull request may close these issues.

[FEATURE/DISCUSSION] Make file paths in tests agnostic to execution source path
7 participants
@eldbud @harshil21 @Bibo-Joshi @Poolitzer @revolter @starry-shivam @iota-008