Commit10987b3

committed

test(ee): add an EE specific test

1 parent17c01ea commit10987b3Copy full SHA for 10987b3

File tree

+11

-5

lines changed

+11

-5

lines changed

Lines changed: 6 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -218,8 +218,9 @@ def test_group_subgroups_projects(gl, user):`
`218`	`218`	`group4.delete()`
`219`	`219`
`220`	`220`
`221`		`-@pytest.mark.skip`
`222`		`-deftest_group_wiki(group):`
	`221`	`+deftest_group_wiki(gitlab_ee,group):`
	`222`	`+ifnotgitlab_ee:`
	`223`	`+pytest.skip("Requires GitLab EE to run")`
`223`	`224`	`content="Group Wiki page content"`
`224`	`225`	`wiki=group.wikis.create({"title":"groupwikipage","content":content})`
`225`	`226`	`assertwikiingroup.wikis.list()`
`@@ -234,8 +235,9 @@ def test_group_wiki(group):`
`234`	`235`	`assertwikinotingroup.wikis.list()`
`235`	`236`
`236`	`237`
`237`		`-@pytest.mark.skip(reason="EE feature")`
`238`		`-deftest_group_hooks(group):`
	`238`	`+deftest_group_hooks(gitlab_ee,group):`
	`239`	`+ifnotgitlab_ee:`
	`240`	`+pytest.skip("Requires GitLab EE to run")`
`239`	`241`	`hook=group.hooks.create({"url":"http://hook.url"})`
`240`	`242`	`asserthookingroup.hooks.list()`
`241`	`243`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ def reset_gitlab(gl: gitlab.Gitlab) -> None:`
`25`	`25`	`# NOTE(jlvillal): By default in GitLab EE it will wait 7 days before`
`26`	`26`	`# deleting a group. Change it to 0 days.`
`27`	`27`	`settings=gl.settings.get()`
`28`		`-logging.info(f"deletion_adjourned_period:{settings.deletion_adjourned_period}")`
`29`	`28`	`ifsettings.deletion_adjourned_period!=0:`
`30`	`29`	`logging.info("Setting deletion_adjourned_period to 0")`
`31`	`30`	`settings.deletion_adjourned_period=0`
`@@ -203,6 +202,11 @@ def is_gitlab_ee(gl: gitlab.Gitlab) -> bool:`
`203`	`202`	`returnFalse`
`204`	`203`
`205`	`204`
	`205`	`+@pytest.fixture(scope="session")`
	`206`	`+defgitlab_ee(gl)->bool:`
	`207`	`+returnis_gitlab_ee(gl=gl)`
	`208`	`+`
	`209`	`+`
`206`	`210`	`@pytest.fixture(scope="session")`
`207`	`211`	`defgitlab_runner(gl):`
`208`	`212`	`container="gitlab-runner-test"`

Comments

(0)