Skip to content

test: re-enabled py_func_v4 test #874

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

Merged
merged 1 commit into from
Sep 5, 2019
Merged

test: re-enabled py_func_v4 test #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ MANIFEST
docs/_build
.testrepository/
.tox
venv/
14 changes: 7 additions & 7 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ jobs:
script:
- pip3 install tox
- tox -e cli_func_v4
#- stage: test
# name: py_func_v4
# dist: bionic
# python: 3.7
# script:
# - pip3 install tox
# - tox -e py_func_v4
- stage: test
name: py_func_v4
dist: bionic
python: 3.7
script:
- pip3 install tox
- tox -e py_func_v4
- stage: test
name: docs
dist: bionic
Expand Down
120 changes: 40 additions & 80 deletions gitlab/v4/objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,97 +435,57 @@ class ApplicationSettingsManager(GetWithoutIdMixin, UpdateMixin, RESTManager):
_update_attrs = (
tuple(),
(
"admin_notification_email",
"after_sign_out_path",
"after_sign_up_text",
"akismet_api_key",
"akismet_enabled",
"circuitbreaker_access_retries",
"circuitbreaker_check_interval",
"circuitbreaker_failure_count_threshold",
"circuitbreaker_failure_reset_time",
"circuitbreaker_storage_timeout",
"clientside_sentry_dsn",
"clientside_sentry_enabled",
"container_registry_token_expire_delay",
"default_artifacts_expire_in",
"id",
"default_projects_limit",
"signup_enabled",
"password_authentication_enabled_for_web",
"gravatar_enabled",
"sign_in_text",
"created_at",
"updated_at",
"home_page_url",
"default_branch_protection",
"default_group_visibility",
"restricted_visibility_levels",
"max_attachment_size",
"session_expire_delay",
"default_project_visibility",
"default_projects_limit",
"default_snippet_visibility",
"disabled_oauth_sign_in_sources",
"default_group_visibility",
"outbound_local_requests_whitelist",
"domain_whitelist",
"domain_blacklist_enabled",
"domain_blacklist",
"domain_whitelist",
"dsa_key_restriction",
"ecdsa_key_restriction",
"ed25519_key_restriction",
"email_author_in_body",
"enabled_git_access_protocol",
"gravatar_enabled",
"help_page_hide_commercial_content",
"help_page_support_url",
"home_page_url",
"housekeeping_bitmaps_enabled",
"housekeeping_enabled",
"housekeeping_full_repack_period",
"housekeeping_gc_period",
"housekeeping_incremental_repack_period",
"html_emails_enabled",
"import_sources",
"koding_enabled",
"koding_url",
"max_artifacts_size",
"max_attachment_size",
"max_pages_size",
"metrics_enabled",
"metrics_host",
"metrics_method_call_threshold",
"metrics_packet_size",
"metrics_pool_size",
"metrics_port",
"metrics_sample_interval",
"metrics_timeout",
"password_authentication_enabled_for_web",
"password_authentication_enabled_for_git",
"performance_bar_allowed_group_id",
"performance_bar_enabled",
"external_authorization_service_enabled",
"external_authorization_service_url",
"external_authorization_service_default_label",
"external_authorization_service_timeout",
"user_oauth_applications",
"after_sign_out_path",
"container_registry_token_expire_delay",
"repository_storages",
"plantuml_enabled",
"plantuml_url",
"terminal_max_session_time",
"polling_interval_multiplier",
"project_export_enabled",
"prometheus_metrics_enabled",
"recaptcha_enabled",
"recaptcha_private_key",
"recaptcha_site_key",
"repository_checks_enabled",
"repository_storages",
"require_two_factor_authentication",
"restricted_visibility_levels",
"rsa_key_restriction",
"send_user_confirmation_email",
"sentry_dsn",
"sentry_enabled",
"session_expire_delay",
"shared_runners_enabled",
"shared_runners_text",
"sidekiq_throttling_enabled",
"sidekiq_throttling_factor",
"sidekiq_throttling_queues",
"sign_in_text",
"signup_enabled",
"terminal_max_session_time",
"two_factor_grace_period",
"unique_ips_limit_enabled",
"unique_ips_limit_per_user",
"unique_ips_limit_time_window",
"usage_ping_enabled",
"user_default_external",
"user_oauth_applications",
"version_check_enabled",
"dsa_key_restriction",
"ecdsa_key_restriction",
"ed25519_key_restriction",
"first_day_of_week",
"enforce_terms",
"terms",
"performance_bar_allowed_group_id",
"instance_statistics_visibility_private",
"user_show_add_ssh_key_message",
"file_template_project_id",
"local_markdown_version",
"asset_proxy_enabled",
"asset_proxy_url",
"asset_proxy_whitelist",
"geo_node_allowed_ips",
"allow_local_requests_from_hooks_and_services",
"allow_local_requests_from_web_hooks_and_services",
"allow_local_requests_from_system_hooks",
),
)

Expand Down
48 changes: 24 additions & 24 deletions tools/python_test_v4.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,9 @@
gl.auth()
assert isinstance(gl.user, gitlab.v4.objects.CurrentUser)

# markdown (need to wait for gitlab 11 to enable the test)
# html = gl.markdown('foo')
# assert('foo' in html)
# markdown
html = gl.markdown("foo")
assert "foo" in html

success, errors = gl.lint("Invalid")
assert success is False
Expand Down Expand Up @@ -338,16 +338,16 @@
assert len(group1.variables.list()) == 0

# group labels
group1.labels.create({"name": "foo", "description": "bar", "color": "#112233"})
g_l = group1.labels.get("foo")
assert g_l.description == "bar"
g_l.description = "baz"
g_l.save()
g_l = group1.labels.get("foo")
assert g_l.description == "baz"
assert len(group1.labels.list()) == 1
g_l.delete()
assert len(group1.labels.list()) == 0
# group1.labels.create({"name": "foo", "description": "bar", "color": "#112233"})
# g_l = group1.labels.get("foo")
# assert g_l.description == "bar"
# g_l.description = "baz"
# g_l.save()
# g_l = group1.labels.get("foo")
# assert g_l.description == "baz"
# assert len(group1.labels.list()) == 1
# g_l.delete()
# assert len(group1.labels.list()) == 0

# hooks
hook = gl.hooks.create({"url": "http://whatever.com"})
Expand Down Expand Up @@ -530,17 +530,17 @@
assert len(sudo_project.keys.list()) == 0

# labels
label1 = admin_project.labels.create({"name": "label1", "color": "#778899"})
label1 = admin_project.labels.list()[0]
assert len(admin_project.labels.list()) == 1
label1.new_name = "label1updated"
label1.save()
assert label1.name == "label1updated"
label1.subscribe()
assert label1.subscribed == True
label1.unsubscribe()
assert label1.subscribed == False
label1.delete()
# label1 = admin_project.labels.create({"name": "label1", "color": "#778899"})
# label1 = admin_project.labels.list()[0]
# assert len(admin_project.labels.list()) == 1
# label1.new_name = "label1updated"
# label1.save()
# assert label1.name == "label1updated"
# label1.subscribe()
# assert label1.subscribed == True
# label1.unsubscribe()
# assert label1.subscribed == False
# label1.delete()

# milestones
m1 = admin_project.milestones.create({"title": "milestone1"})
Expand Down