Skip to content

Commit c7d7ceb

Browse files
committed
tests: windows compatibility(WIP)
1 parent 4650c6f commit c7d7ceb

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

tests/helpers/ptrack_helpers.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import testgres
88
import hashlib
99
import re
10-
import pwd
10+
import getpass
1111
import select
1212
import psycopg2
1313
from time import sleep
@@ -89,8 +89,14 @@ def dir_files(base_dir):
8989

9090
def is_enterprise():
9191
# pg_config --help
92+
if os.name == 'posix':
93+
cmd = [os.environ['PG_CONFIG'], '--help']
94+
95+
elif os.name == 'nt':
96+
cmd = [[os.environ['PG_CONFIG']], ['--help']]
97+
9298
p = subprocess.Popen(
93-
[os.environ['PG_CONFIG'], '--help'],
99+
cmd,
94100
stdout=subprocess.PIPE,
95101
stderr=subprocess.PIPE
96102
)
@@ -955,7 +961,7 @@ def get_pgpro_edition(self, node):
955961

956962
def get_username(self):
957963
""" Returns current user name """
958-
return pwd.getpwuid(os.getuid())[0]
964+
return getpass.getuser()
959965

960966
def version_to_num(self, version):
961967
if not version:

0 commit comments

Comments
 (0)