NotificationsYou must be signed in to change notification settings
Fork35
Star147

Commita7662d1

authored

[#256] Port number 65535 is valid for using (#268)

This patch corrects PortManager__Generic: - Valid port range is [1024, 65535]. Old range was [1024, 65535) - Strange (copy&paste) code for self._available_ports initialization is corrected - Strange (copy&paste) code for self._reserved_ports initialization is corrected - New asserts are added

1 parent44d61c2 commita7662d1Copy full SHA for a7662d1

File tree

1 file changed

+21

-2

lines changed

testgres/impl
- port_manager__generic.py

1 file changed

+21

-2

lines changed

`‎testgres/impl/port_manager__generic.py`

Lines changed: 21 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,19 +9,31 @@`
`9`	`9`
`10`	`10`
`11`	`11`	`classPortManager__Generic(PortManager):`
	`12`	`+_C_MIN_PORT_NUMBER=1024`
	`13`	`+_C_MAX_PORT_NUMBER=65535`
	`14`	`+`
`12`	`15`	`_os_ops:OsOperations`
`13`	`16`	`_guard:object`
`14`	`17`	`# TODO: is there better to use bitmap fot _available_ports?`
`15`	`18`	`_available_ports:typing.Set[int]`
`16`	`19`	`_reserved_ports:typing.Set[int]`
`17`	`20`
`18`	`21`	`def__init__(self,os_ops:OsOperations):`
	`22`	`+assert__class__._C_MIN_PORT_NUMBER<=__class__._C_MAX_PORT_NUMBER`
	`23`	`+`
`19`	`24`	`assertos_opsisnotNone`
`20`	`25`	`assertisinstance(os_ops,OsOperations)`
`21`	`26`	`self._os_ops=os_ops`
`22`	`27`	`self._guard=threading.Lock()`
`23`		`-self._available_ports:typing.Set[int]=set(range(1024,65535))`
`24`		`-self._reserved_ports:typing.Set[int]=set()`
	`28`	`+`
	`29`	`+self._available_ports=set(`
	`30`	`+range(__class__._C_MIN_PORT_NUMBER,__class__._C_MAX_PORT_NUMBER+1)`
	`31`	`+ )`
	`32`	`+assertlen(self._available_ports)== (`
	`33`	`+ (__class__._C_MAX_PORT_NUMBER-__class__._C_MIN_PORT_NUMBER)+1`
	`34`	`+ )`
	`35`	`+self._reserved_ports=set()`
	`36`	`+return`
`25`	`37`
`26`	`38`	`defreserve_port(self)->int:`
`27`	`39`	`assertself._guardisnotNone`
`@@ -35,9 +47,13 @@ def reserve_port(self) -> int:`
`35`	`47`	`t=None`
`36`	`48`
`37`	`49`	`forportinsampled_ports:`
	`50`	`+asserttype(port)==int# noqa: E721`
`38`	`51`	`assertnot (portinself._reserved_ports)`
`39`	`52`	`assertportinself._available_ports`
`40`	`53`
	`54`	`+assertport>=__class__._C_MIN_PORT_NUMBER`
	`55`	`+assertport<=__class__._C_MAX_PORT_NUMBER`
	`56`	`+`
`41`	`57`	`ifnotself._os_ops.is_port_free(port):`
`42`	`58`	`continue`
`43`	`59`
`@@ -51,6 +67,8 @@ def reserve_port(self) -> int:`
`51`	`67`
`52`	`68`	`defrelease_port(self,number:int)->None:`
`53`	`69`	`asserttype(number)==int# noqa: E721`
	`70`	`+assertnumber>=__class__._C_MIN_PORT_NUMBER`
	`71`	`+assertnumber<=__class__._C_MAX_PORT_NUMBER`
`54`	`72`
`55`	`73`	`assertself._guardisnotNone`
`56`	`74`	`asserttype(self._reserved_ports)==set# noqa: E721`
`@@ -62,3 +80,4 @@ def release_port(self, number: int) -> None:`
`62`	`80`	`self._reserved_ports.discard(number)`
`63`	`81`	`assertnot (numberinself._reserved_ports)`
`64`	`82`	`assertnumberinself._available_ports`
	`83`	`+return`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita7662d1

File tree

1 file changed

1 file changed

`‎testgres/impl/port_manager__generic.py`

0 commit comments