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

Cleanup build and test related settings #480

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Cleanup build and test related settings #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
135abc3
cleanup build and test related settings
DaeunYim Sep 27, 2023
257dd7d
empty commit to trigger build?
DaeunYim Dec 20, 2023
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
16 changes: 8 additions & 8 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
*.pyc
.pylintrc
server.log
.DS_Store
.idea
.vscode
cover
.coverage
.cache
*.log

htmlcov
.coverage
nose2-junit.xml

build/
dist/
*.tar.gz
coverage.xml
nosetests.xml
.pylintrc
.noseids
*.log

.mypy_cache/
*venv/
nose2-junit.xml
1 change: 0 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ xlsxwriter
jinja2

# Build/Test Requirements
cx_freeze
nose2
parameterized
coverage
Expand Down
21 changes: 0 additions & 21 deletions setup.py
View file
Open in desktop

This file was deleted.

12 changes: 6 additions & 6 deletions tests/disaster_recovery/test_disaster_recovery_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ def test_get_pg_exe_path_local_win(self):
sys.platform = old_platform

def test_get_pg_exe_path_frozen_linux(self):
"""Test the get_pg_exe_path function for linux when the service is running from a cx_freeze build"""
"""Test the get_pg_exe_path function for linux when the service is running from a build"""
# Back up these values so that the test can overwrite them
old_arg0 = sys.argv[0]
old_platform = sys.platform
Expand All @@ -180,7 +180,7 @@ def test_get_pg_exe_path_frozen_linux(self):
try:
with mock.patch('os.walk', new=mock.Mock(return_value=return_value)):
with mock.patch('os.path.exists', new=mock.Mock(return_value=True)):
# Override sys.argv[0] to simulate running the code from a cx_freeze build
# Override sys.argv[0] to simulate running the code from a build
sys.argv[0] = os.path.normpath('/ossdbtoolsservice/build/ossdbtoolsservice/ossdbtoolsservice_main')

# If I get the executable path on Linux
Expand All @@ -193,7 +193,7 @@ def test_get_pg_exe_path_frozen_linux(self):
sys.platform = old_platform

def test_get_pg_exe_path_frozen_mac(self):
"""Test the get_pg_exe_path function for mac when the service is running from a cx_freeze build"""
"""Test the get_pg_exe_path function for mac when the service is running from a build"""
# Back up these values so that the test can overwrite them
old_arg0 = sys.argv[0]
old_platform = sys.platform
Expand All @@ -205,7 +205,7 @@ def test_get_pg_exe_path_frozen_mac(self):
try:
with mock.patch('os.walk', new=mock.Mock(return_value=return_value)):
with mock.patch('os.path.exists', new=mock.Mock(return_value=True)):
# Override sys.argv[0] to simulate running the code from a cx_freeze build
# Override sys.argv[0] to simulate running the code from a build
sys.argv[0] = os.path.normpath('/ossdbtoolsservice/build/ossdbtoolsservice/ossdbtoolsservice_main')

# If I get the executable path on Mac
Expand All @@ -218,7 +218,7 @@ def test_get_pg_exe_path_frozen_mac(self):
sys.platform = old_platform

def test_get_pg_exe_path_frozen_win(self):
"""Test the get_pg_exe_path function for windows when the service is running from a cx_freeze build"""
"""Test the get_pg_exe_path function for windows when the service is running from a build"""
# Back up these values so that the test can overwrite them
old_arg0 = sys.argv[0]
old_platform = sys.platform
Expand All @@ -230,7 +230,7 @@ def test_get_pg_exe_path_frozen_win(self):
try:
with mock.patch('os.walk', new=mock.Mock(return_value=return_value)):
with mock.patch('os.path.exists', new=mock.Mock(return_value=True)):
# Override sys.argv[0] to simulate running the code from a cx_freeze build
# Override sys.argv[0] to simulate running the code from a build
sys.argv[0] = os.path.normpath('/ossdbtoolsservice/build/ossdbtoolsservice/ossdbtoolsservice_main')

# If I get the executable path on Windows
Expand Down