Commitc5a37e7

committed

test(api,cli): add tests for custom user agent

1 parent4bb201b commitc5a37e7Copy full SHA for c5a37e7

File tree

+46

-2

lines changed

+46

-2

lines changed

Lines changed: 32 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,12 @@`
`21`	`21`	`importmock`
`22`	`22`	`importio`
`23`	`23`
`24`		`-fromgitlabimportconfig`
	`24`	`+fromgitlabimportconfig,USER_AGENT`
`25`	`25`	`importpytest`
`26`	`26`
`27`	`27`
	`28`	`+custom_user_agent="my-package/1.0.0"`
	`29`	`+`
`28`	`30`	`valid_config=u"""[global]`
`29`	`31`	`default = one`
`30`	`32`	`ssl_verify = true`
`@@ -51,6 +53,17 @@`
`51`	`53`	`oauth_token = STUV`
`52`	`54`	`"""`
`53`	`55`
	`56`	`+custom_user_agent_config="""[global]`
	`57`	`+default = one`
	`58`	`+user_agent = {}`
	`59`	`+`
	`60`	`+[one]`
	`61`	`+url = http://one.url`
	`62`	`+private_token = ABCDEF`
	`63`	`+""".format(`
	`64`	`+custom_user_agent`
	`65`	`+)`
	`66`	`+`
`54`	`67`	`no_default_config=u"""[global]`
`55`	`68`	`[there]`
`56`	`69`	`url = http://there.url`
`@@ -178,3 +191,21 @@ def test_valid_data(m_open, path_exists):`
`178`	`191`	`assert"STUV"==cp.oauth_token`
`179`	`192`	`assert2==cp.timeout`
`180`	`193`	`assertTrue==cp.ssl_verify`
	`194`	`+`
	`195`	`+`
	`196`	`+@mock.patch("os.path.exists")`
	`197`	`+@mock.patch("builtins.open")`
	`198`	`+@pytest.mark.parametrize(`
	`199`	`+"config_string,expected_agent",`
	`200`	`+ [`
	`201`	`+ (valid_config,USER_AGENT),`
	`202`	`+ (custom_user_agent_config,custom_user_agent),`
	`203`	`+ ],`
	`204`	`+)`
	`205`	`+deftest_config_user_agent(m_open,path_exists,config_string,expected_agent):`
	`206`	`+fd=io.StringIO(config_string)`
	`207`	`+fd.close=mock.Mock(return_value=None)`
	`208`	`+m_open.return_value=fd`
	`209`	`+`
	`210`	`+cp=config.GitlabConfigParser()`
	`211`	`+assertcp.user_agent==expected_agent`

Lines changed: 14 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,10 @@`
`18`	`18`
`19`	`19`	`importpickle`
`20`	`20`
	`21`	`+importpytest`
`21`	`22`	`fromhttmockimportHTTMock,response,urlmatch,with_httmock# noqa`
`22`	`23`
`23`		`-fromgitlabimportGitlab,GitlabList`
	`24`	`+fromgitlabimportGitlab,GitlabList,USER_AGENT`
`24`	`25`	`fromgitlab.v4.objectsimportCurrentUser`
`25`	`26`
`26`	`27`
`@@ -139,3 +140,15 @@ class MyGitlab(Gitlab):`
`139`	`140`	`config_path=default_config`
`140`	`141`	`gl=MyGitlab.from_config("one", [config_path])`
`141`	`142`	`assertisinstance(gl,MyGitlab)`
	`143`	`+`
	`144`	`+`
	`145`	`+@pytest.mark.parametrize(`
	`146`	`+"kwargs,expected_agent",`
	`147`	`+ [`
	`148`	`+ ({},USER_AGENT),`
	`149`	`+ ({"user_agent":"my-package/1.0.0"},"my-package/1.0.0"),`
	`150`	`+ ],`
	`151`	`+)`
	`152`	`+deftest_gitlab_user_agent(kwargs,expected_agent):`
	`153`	`+gl=Gitlab("http://localhost",**kwargs)`
	`154`	`+assertgl.headers["User-Agent"]==expected_agent`

Comments

(0)