[ci]: Updating fix to make_test_base

dmpgpro · dmpgpro · commit b84a81d3a85f · 2017-09-15T11:57:13.000+03:00
diff --git a/.ci/make_test_base b/.ci/make_test_base
@@ -7,11 +7,22 @@ put into postgresql conf.
 
 On success, starts database
 """
-import os,sys,subprocess,glob,re,os.path,time
+import os,sys,subprocess,glob,re,os.path,time,re
 
 if len(sys.argv)!=2:
     print >>sys.stderr,"Usage %s data-directory" % sys.argv[0]
     sys.exit(1)
+    
+def prepare_extlist(value):
+    v = re.sub("[']", '', value)
+    l = re.split("\s*,\s*",v)
+    if "pg_pathman" in l:
+        # remove duplicates and reorder extension list to move pg_pathman to tail
+        nl = sorted(list(set(l)), cmp = lambda a,b: 1 if a=="pg_pathman" else -1)
+        new_value = "'{}'".format(",".join(nl))
+        return new_value
+    else:
+        return value
 
 datadir=sys.argv[1]
 
@@ -27,7 +38,7 @@ if exitcode:
     sys.exit(exitcode)
 # Collect extra config option
 addopts={}
-for module in sorted(glob.glob("contrib/*"), cmp = lambda a,b: 1 if a=="pg_pathman" else -1):
+for module in glob.glob("contrib/*"):
     if not os.path.isdir(module):
         continue
     if not os.access(module+"/Makefile",os.R_OK):
@@ -59,7 +70,7 @@ for module in sorted(glob.glob("contrib/*"), cmp = lambda a,b: 1 if a=="pg_pathm
 if addopts:
     with open(datadir+"/postgresql.conf","a") as f:
         for opt,value in addopts.items():
-            print >> f,"%s=%s"%(opt,value)
+            print >> f,"%s=%s"%(opt,prepare_extlist(value))
 with open("initdb.log","a") as f:
     exitcode=subprocess.call(["pg_ctl","start","-D",datadir,"-l",datadir+"/postmaster.log"],env=env,stdout=f,stderr=subprocess.STDOUT)
 if exitcode:
@@ -73,5 +84,3 @@ while time.time() < failtime:
         sys.exit(0)
 print >>sys.stderr,"Database havent't started in 60 seconds"
 sys.exit(1)
-
-
